about summary refs log tree commit diff stats
path: root/html
diff options
context:
space:
mode:
authorKartik Agaram <vc@akkartik.com>2019-03-29 00:47:30 -0700
committerKartik Agaram <vc@akkartik.com>2019-03-29 00:47:30 -0700
commit9c1056f531217f3c1c12b3b3a648ca1cffe4beab (patch)
tree0e5a0bd0619e481470be58c11805434c630d996b /html
parentd689ac180ad47222aa59944d42c1e26e7b2423c6 (diff)
downloadmu-9c1056f531217f3c1c12b3b3a648ca1cffe4beab.tar.gz
5033
Diffstat (limited to 'html')
-rw-r--r--html/subx/000organization.cc.html11
-rw-r--r--html/subx/001help.cc.html51
-rw-r--r--html/subx/002test.cc.html45
-rw-r--r--html/subx/003trace.cc.html904
-rw-r--r--html/subx/003trace.test.cc.html204
-rw-r--r--html/subx/010---vm.cc.html216
-rw-r--r--html/subx/011run.cc.html725
-rw-r--r--html/subx/012elf.cc.html71
-rw-r--r--html/subx/013direct_addressing.cc.html1744
-rw-r--r--html/subx/014indirect_addressing.cc.html1353
-rw-r--r--html/subx/015immediate_addressing.cc.html1487
-rw-r--r--html/subx/016index_addressing.cc.html275
-rw-r--r--html/subx/017jump_disp8.cc.html645
-rw-r--r--html/subx/018jump_disp32.cc.html645
-rw-r--r--html/subx/019functions.cc.html212
-rw-r--r--html/subx/020syscalls.cc.html82
-rw-r--r--html/subx/021byte_addressing.cc.html252
-rw-r--r--html/subx/028translate.cc.html63
-rw-r--r--html/subx/030---operands.cc.html871
-rw-r--r--html/subx/031check_operands.cc.html1263
-rw-r--r--html/subx/032check_operand_bounds.cc.html203
-rw-r--r--html/subx/034compute_segment_address.cc.html338
-rw-r--r--html/subx/035labels.cc.html625
-rw-r--r--html/subx/036global_variables.cc.html539
-rw-r--r--html/subx/037heap.cc.html22
-rw-r--r--html/subx/038---literal_strings.cc.html512
-rw-r--r--html/subx/039debug.cc.html68
-rw-r--r--html/subx/040---tests.cc.html163
-rw-r--r--html/subx/052kernel-string-equal.subx.html2
-rw-r--r--html/subx/054string-equal.subx.html6
-rw-r--r--html/subx/058stream-equal.subx.html1295
-rw-r--r--html/subx/060read.subx.html4
-rw-r--r--html/subx/062write-stream.subx.html4
-rw-r--r--html/subx/064write-byte.subx.html4
-rw-r--r--html/subx/066print-byte.subx.html2
-rw-r--r--html/subx/067write-buffered.subx.html4
-rw-r--r--html/subx/071read-line.subx.html547
-rw-r--r--html/subx/072slice.subx.html314
-rw-r--r--html/subx/073next-token.subx.html1050
-rw-r--r--html/subx/apps/crenshaw2-1.subx.html2
-rw-r--r--html/subx/apps/crenshaw2-1b.subx.html4
-rw-r--r--html/subx/apps/hex.subx.html6
-rw-r--r--html/subx/apps/pack.subx.html4630
-rw-r--r--html/subx/examples/ex10.subx.html2
-rw-r--r--html/subx/examples/ex11.subx.html4
45 files changed, 12048 insertions, 9421 deletions
diff --git a/html/subx/000organization.cc.html b/html/subx/000organization.cc.html
index 379bf4fe..d586451d 100644
--- a/html/subx/000organization.cc.html
+++ b/html/subx/000organization.cc.html
@@ -15,11 +15,12 @@ body { font-size:12pt; font-family: monospace; color: #000000; background-color:
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
 .LineNr { }
-.Constant { color: #008787; }
 .Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
 .Identifier { color: #af5f00; }
 .Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 .Comment { color: #005faf; }
+.PreProc { color: #c000c0; }
 -->
 </style>
 
@@ -155,7 +156,7 @@ if ('onhashchange' in window) {
 <span id="L98" class="LineNr"> 98 </span><span class="Comment">// functions in any order. Just be sure to declare each function header all on</span>
 <span id="L99" class="LineNr"> 99 </span><span class="Comment">// one line, ending with the '{'. Our auto-generation scripts are too minimal</span>
 <span id="L100" class="LineNr">100 </span><span class="Comment">// and simple-minded to handle anything else.</span>
-<span id="L101" class="LineNr">101 </span><span class="Comment">#include &quot;function_list&quot;  // by convention, files ending with '_list' are auto-generated</span>
+<span id="L101" class="LineNr">101 </span><span class="PreProc">#include </span><span class="Constant">&quot;function_list&quot;</span>  <span class="Comment">// by convention, files ending with '_list' are auto-generated</span>
 <span id="L102" class="LineNr">102 </span>
 <span id="L103" class="LineNr">103 </span><span class="Comment">// Globals</span>
 <span id="L104" class="LineNr">104 </span><span class="Comment">//</span>
@@ -189,8 +190,8 @@ if ('onhashchange' in window) {
 <span id="L132" class="LineNr">132 </span>
 <span id="L133" class="LineNr">133 </span><span class="Comment">//: our first directive; insert the following headers at the start of the program</span>
 <span id="L134" class="LineNr">134 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L135" class="LineNr">135 </span><span class="Comment">#include &lt;assert.h&gt;</span>
-<span id="L136" class="LineNr">136 </span><span class="Comment">#include &lt;stdlib.h&gt;</span>
+<span id="L135" class="LineNr">135 </span><span class="PreProc">#include </span><span class="Constant">&lt;assert.h&gt;</span>
+<span id="L136" class="LineNr">136 </span><span class="PreProc">#include </span><span class="Constant">&lt;stdlib.h&gt;</span>
 <span id="L137" class="LineNr">137 </span>
 <span id="L138" class="LineNr">138 </span><span class="Comment">//: Without directives or with the :(code) directive, lines get added at the</span>
 <span id="L139" class="LineNr">139 </span><span class="Comment">//: end.</span>
@@ -215,7 +216,7 @@ if ('onhashchange' in window) {
 <span id="L158" class="LineNr">158 </span>  <span class="Delimiter">}</span>
 <span id="L159" class="LineNr">159 </span><span class="Delimiter">}</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;iostream&gt;</span>
+<span id="L161" class="LineNr">161 </span><span class="PreProc">#include</span><span class="Constant">&lt;iostream&gt;</span>
 <span id="L162" class="LineNr">162 </span><span class="Normal">using</span> std::cerr<span class="Delimiter">;</span>
 </pre>
 </body>
diff --git a/html/subx/001help.cc.html b/html/subx/001help.cc.html
index 665289bb..080b5ae1 100644
--- a/html/subx/001help.cc.html
+++ b/html/subx/001help.cc.html
@@ -15,6 +15,7 @@ body { font-size:12pt; font-family: monospace; color: #000000; background-color:
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
 .CommentedCode { color: #8a8a8a; }
+.PreProc { color: #c000c0; }
 .LineNr { }
 .Constant { color: #008787; }
 .Delimiter { color: #c000c0; }
@@ -112,18 +113,18 @@ if ('onhashchange' in window) {
 <span id="L52" class="LineNr"> 52 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
 <span id="L53" class="LineNr"> 53 </span>map&lt;string<span class="Delimiter">,</span> string&gt; <span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">;</span>
 <span id="L54" class="LineNr"> 54 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L55" class="LineNr"> 55 </span><span class="Comment">#include &lt;map&gt;</span>
+<span id="L55" class="LineNr"> 55 </span><span class="PreProc">#include </span><span class="Constant">&lt;map&gt;</span>
 <span id="L56" class="LineNr"> 56 </span><span class="Normal">using</span> std::map<span class="Delimiter">;</span>
 <span id="L57" class="LineNr"> 57 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
 <span id="L58" class="LineNr"> 58 </span><a href='001help.cc.html#L60'>init_help</a><span class="Delimiter">();</span>
 <span id="L59" class="LineNr"> 59 </span><span class="Delimiter">:(code)</span>
 <span id="L60" class="LineNr"> 60 </span><span class="Normal">void</span> <a href='001help.cc.html#L60'>init_help</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
 <span id="L61" class="LineNr"> 61 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;usage&quot;</span><span class="Delimiter">,</span>
-<span id="L62" class="LineNr"> 62 </span>    <span class="Constant">&quot;Welcome to SubX, a better way to <a href='011run.cc.html#L95'>program</a> in machine code.\n&quot;</span>
+<span id="L62" class="LineNr"> 62 </span>    <span class="Constant">&quot;Welcome to SubX, a better way to <a href='011run.cc.html#L102'>program</a> in machine code.\n&quot;</span>
 <span id="L63" class="LineNr"> 63 </span>    <span class="Constant">&quot;SubX uses a subset of the x86 instruction set. SubX programs will run\n&quot;</span>
 <span id="L64" class="LineNr"> 64 </span>    <span class="Constant">&quot;without modification on Linux computers.\n&quot;</span>
 <span id="L65" class="LineNr"> 65 </span>    <span class="Constant">&quot;It provides a better experience and better error messages than\n&quot;</span>
-<span id="L66" class="LineNr"> 66 </span>    <span class="Constant">&quot;programming directly in machine <a href='031check_operands.cc.html#L11'>code</a>, but you have to stick to the\n&quot;</span>
+<span id="L66" class="LineNr"> 66 </span>    <span class="Constant">&quot;programming directly in machine code, but you have to stick to the\n&quot;</span>
 <span id="L67" class="LineNr"> 67 </span>    <span class="Constant">&quot;instructions it supports.\n&quot;</span>
 <span id="L68" class="LineNr"> 68 </span>    <span class="Constant">&quot;\n&quot;</span>
 <span id="L69" class="LineNr"> 69 </span>    <span class="Constant">&quot;== Ways to invoke subx\n&quot;</span>
@@ -131,24 +132,24 @@ if ('onhashchange' in window) {
 <span id="L71" class="LineNr"> 71 </span>    <span class="Constant">&quot;    subx test\n&quot;</span>
 <span id="L72" class="LineNr"> 72 </span>    <span class="Constant">&quot;- See this message:\n&quot;</span>
 <span id="L73" class="LineNr"> 73 </span>    <span class="Constant">&quot;    subx --help\n&quot;</span>
-<span id="L74" class="LineNr"> 74 </span>    <span class="Constant">&quot;- Convert a textual SubX <a href='011run.cc.html#L95'>program</a> into a standard ELF binary that you can\n&quot;</span>
-<span id="L75" class="LineNr"> 75 </span>    <span class="Constant">&quot;  <a href='011run.cc.html#L79'>run</a> on your computer:\n&quot;</span>
+<span id="L74" class="LineNr"> 74 </span>    <span class="Constant">&quot;- Convert a textual SubX <a href='011run.cc.html#L102'>program</a> into a standard ELF binary that you can\n&quot;</span>
+<span id="L75" class="LineNr"> 75 </span>    <span class="Constant">&quot;  <a href='011run.cc.html#L86'>run</a> on your computer:\n&quot;</span>
 <span id="L76" class="LineNr"> 76 </span>    <span class="Constant">&quot;    subx translate input1.subx intput2.subx ... -o &lt;output ELF binary&gt;\n&quot;</span>
 <span id="L77" class="LineNr"> 77 </span>    <span class="Constant">&quot;- Run a SubX binary using SubX itself (for better error messages):\n&quot;</span>
-<span id="L78" class="LineNr"> 78 </span>    <span class="Constant">&quot;    subx <a href='011run.cc.html#L79'>run</a> &lt;ELF binary&gt;\n&quot;</span>
+<span id="L78" class="LineNr"> 78 </span>    <span class="Constant">&quot;    subx <a href='011run.cc.html#L86'>run</a> &lt;ELF binary&gt;\n&quot;</span>
 <span id="L79" class="LineNr"> 79 </span>    <span class="Constant">&quot;\n&quot;</span>
 <span id="L80" class="LineNr"> 80 </span>    <span class="Constant">&quot;== Debugging aids\n&quot;</span>
-<span id="L81" class="LineNr"> 81 </span>    <span class="Constant">&quot;- Add '--trace' to any of these commands to print a <a href='003trace.cc.html#L98'>trace</a> to stderr\n&quot;</span>
+<span id="L81" class="LineNr"> 81 </span>    <span class="Constant">&quot;- Add '--trace' to any of these commands to print a <a href='003trace.cc.html#L96'>trace</a> to stderr\n&quot;</span>
 <span id="L82" class="LineNr"> 82 </span>    <span class="Constant">&quot;  for debugging purposes.\n&quot;</span>
 <span id="L83" class="LineNr"> 83 </span>    <span class="Constant">&quot;- Add '--map' to add information to traces. 'subx --map translate' will save\n&quot;</span>
 <span id="L84" class="LineNr"> 84 </span>    <span class="Constant">&quot;  (to a file called 'map') the mapping from labels to addresses that it computes\n&quot;</span>
 <span id="L85" class="LineNr"> 85 </span>    <span class="Constant">&quot;  during translation. This file is then available to 'subx --map --trace run'\n&quot;</span>
-<span id="L86" class="LineNr"> 86 </span>    <span class="Constant">&quot;  which prints out label names in the <a href='003trace.cc.html#L98'>trace</a> as it encounters them.\n&quot;</span>
+<span id="L86" class="LineNr"> 86 </span>    <span class="Constant">&quot;  which prints out label names in the <a href='003trace.cc.html#L96'>trace</a> as it encounters them.\n&quot;</span>
 <span id="L87" class="LineNr"> 87 </span>    <span class="Constant">&quot;\n&quot;</span>
 <span id="L88" class="LineNr"> 88 </span>    <span class="Constant">&quot;Options starting with '--' must always come before any other arguments.\n&quot;</span>
 <span id="L89" class="LineNr"> 89 </span>    <span class="Constant">&quot;\n&quot;</span>
 <span id="L90" class="LineNr"> 90 </span>    <span class="Constant">&quot;To start learning how to write SubX programs, see Readme.md (particularly\n&quot;</span>
-<span id="L91" class="LineNr"> 91 </span>    <span class="Constant">&quot;the section on the x86 instruction set) and then <a href='011run.cc.html#L79'>run</a>:\n&quot;</span>
+<span id="L91" class="LineNr"> 91 </span>    <span class="Constant">&quot;the section on the x86 instruction set) and then <a href='011run.cc.html#L86'>run</a>:\n&quot;</span>
 <span id="L92" class="LineNr"> 92 </span>    <span class="Constant">&quot;  subx help\n&quot;</span>
 <span id="L93" class="LineNr"> 93 </span>  <span class="Delimiter">);</span>
 <span id="L94" class="LineNr"> 94 </span>  <span class="Comment">// End Help Texts</span>
@@ -162,7 +163,7 @@ if ('onhashchange' in window) {
 <span id="L102" class="LineNr">102 </span><span class="Normal">bool</span> <a href='001help.cc.html#L102'>starts_with</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; pat<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L103" class="LineNr">103 </span>  string::const_iterator a=s<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> b=pat<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>
 <span id="L104" class="LineNr">104 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">nada</span><span class="Comment">*/</span><span class="Delimiter">;</span>  a!=s<span class="Delimiter">.</span>end<span class="Delimiter">()</span> &amp;&amp; b!=pat<span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++a<span class="Delimiter">,</span> ++b<span class="Delimiter">)</span>
-<span id="L105" class="LineNr">105 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>*a != *b<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L105" class="LineNr">105 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>*a != *b<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L106" class="LineNr">106 </span>  <span class="Identifier">return</span> b == pat<span class="Delimiter">.</span>end<span class="Delimiter">();</span>
 <span id="L107" class="LineNr">107 </span><span class="Delimiter">}</span>
 <span id="L108" class="LineNr">108 </span>
@@ -223,7 +224,7 @@ if ('onhashchange' in window) {
 <span id="L163" class="LineNr">163 </span><span class="Comment">//: since multiplying two integers seems like a more common situation to end</span>
 <span id="L164" class="LineNr">164 </span><span class="Comment">//: up in than integer overflow.</span>
 <span id="L165" class="LineNr">165 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L166" class="LineNr">166 </span><span class="Comment">#define SIZE(X) (assert((X).size() &lt; (1LL&lt;&lt;(sizeof(int)*8-2))), static_cast&lt;int&gt;((X).size()))</span>
+<span id="L166" class="LineNr">166 </span><span class="PreProc">#define SIZE(</span><span class="Special">X</span><span class="PreProc">) (assert((</span><span class="Special">X</span><span class="PreProc">)</span><span class="Delimiter">.</span><span class="PreProc">size() &lt; (</span><span class="Constant">1LL</span><span class="PreProc">&lt;&lt;(</span><span class="Normal">sizeof</span><span class="PreProc">(</span><span class="Normal">int</span><span class="PreProc">)*</span><span class="Constant">8</span><span class="PreProc">-</span><span class="Constant">2</span><span class="PreProc">)))</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Normal">static_cast</span><span class="PreProc">&lt;</span><span class="Normal">int</span><span class="PreProc">&gt;((</span><span class="Special">X</span><span class="PreProc">)</span><span class="Delimiter">.</span><span class="PreProc">size()))</span>
 <span id="L167" class="LineNr">167 </span>
 <span id="L168" class="LineNr">168 </span><span class="Comment">//: 5. Integer overflow is guarded against at runtime using the -ftrapv flag</span>
 <span id="L169" class="LineNr">169 </span><span class="Comment">//: to the compiler, supported by Clang (GCC version only works sometimes:</span>
@@ -245,23 +246,23 @@ if ('onhashchange' in window) {
 <span id="L185" class="LineNr">185 </span><span class="Normal">void</span> <a href='001help.cc.html#L185'>dump_and_exit</a><span class="Delimiter">(</span><span class="Normal">int</span> sig<span class="Delimiter">,</span> siginfo_t* <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">,</span> <span class="Normal">void</span>* <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L186" class="LineNr">186 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>sig<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L187" class="LineNr">187 </span>    <span class="Normal">case</span> <span class="Constant">SIGABRT</span>:
-<span id="L188" class="LineNr">188 </span>      <span class="Comment">#ifndef __APPLE__</span>
+<span id="L188" class="LineNr">188 </span>      <span class="PreProc">#ifndef __APPLE__</span>
 <span id="L189" class="LineNr">189 </span>        cerr &lt;&lt; <span class="Constant">&quot;SIGABRT: might be an integer overflow if it wasn't an assert() failure\n&quot;</span><span class="Delimiter">;</span>
 <span id="L190" class="LineNr">190 </span>        _Exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L191" class="LineNr">191 </span>      <span class="Comment">#endif</span>
+<span id="L191" class="LineNr">191 </span>      <span class="PreProc">#endif</span>
 <span id="L192" class="LineNr">192 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L193" class="LineNr">193 </span>    <span class="Normal">case</span> <span class="Constant">SIGILL</span>:
-<span id="L194" class="LineNr">194 </span>      <span class="Comment">#ifdef __APPLE__</span>
+<span id="L194" class="LineNr">194 </span>      <span class="PreProc">#ifdef __APPLE__</span>
 <span id="L195" class="LineNr">195 </span>        cerr &lt;&lt; <span class="Constant">&quot;SIGILL: most likely caused by integer overflow\n&quot;</span><span class="Delimiter">;</span>
 <span id="L196" class="LineNr">196 </span>        _Exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L197" class="LineNr">197 </span>      <span class="Comment">#endif</span>
+<span id="L197" class="LineNr">197 </span>      <span class="PreProc">#endif</span>
 <span id="L198" class="LineNr">198 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L199" class="LineNr">199 </span>    <span class="Normal">default</span>:
 <span id="L200" class="LineNr">200 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L201" class="LineNr">201 </span>  <span class="Delimiter">}</span>
 <span id="L202" class="LineNr">202 </span><span class="Delimiter">}</span>
 <span id="L203" class="LineNr">203 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L204" class="LineNr">204 </span><span class="Comment">#include &lt;signal.h&gt;</span>
+<span id="L204" class="LineNr">204 </span><span class="PreProc">#include </span><span class="Constant">&lt;signal.h&gt;</span>
 <span id="L205" class="LineNr">205 </span>
 <span id="L206" class="LineNr">206 </span><span class="Comment">//: For good measure we'll also enable SIGFPE.</span>
 <span id="L207" class="LineNr">207 </span><span class="Delimiter">:(before &quot;atexit(reset)&quot;)</span>
@@ -273,9 +274,9 @@ if ('onhashchange' in window) {
 <span id="L213" class="LineNr">213 </span><span class="CommentedCode">//? cerr &lt;&lt; &quot;ε: &quot; &lt;&lt; smallest_subnormal_f &lt;&lt; '\n';</span>
 <span id="L214" class="LineNr">214 </span><span class="CommentedCode">//? cerr &lt;&lt; &quot;ε/2: &quot; &lt;&lt; smallest_subnormal_f/2 &lt;&lt; &quot; (underflow)\n&quot;;  // test SIGFPE</span>
 <span id="L215" class="LineNr">215 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L216" class="LineNr">216 </span><span class="Comment">#include &lt;fenv.h&gt;</span>
+<span id="L216" class="LineNr">216 </span><span class="PreProc">#include </span><span class="Constant">&lt;fenv.h&gt;</span>
 <span id="L217" class="LineNr">217 </span><span class="Delimiter">:(code)</span>
-<span id="L218" class="LineNr">218 </span><span class="Comment">#ifdef __APPLE__</span>
+<span id="L218" class="LineNr">218 </span><span class="PreProc">#ifdef __APPLE__</span>
 <span id="L219" class="LineNr">219 </span><span class="Comment">// Public domain polyfill for feenableexcept on OS X</span>
 <span id="L220" class="LineNr">220 </span><span class="Comment">// <a href="http://www-personal.umich.edu/~williams/archive/computation/fe-handling-example.c">http://www-personal.umich.edu/~williams/archive/computation/fe-handling-example.c</a></span>
 <span id="L221" class="LineNr">221 </span><span class="Normal">int</span> <a href='001help.cc.html#L221'>feenableexcept</a><span class="Delimiter">(</span><span class="Normal">unsigned</span> <span class="Normal">int</span> excepts<span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -288,7 +289,7 @@ if ('onhashchange' in window) {
 <span id="L228" class="LineNr">228 </span>  fenv<span class="Delimiter">.</span>__mxcsr &amp;= ~<span class="Delimiter">(</span>new_excepts &lt;&lt; <span class="Constant">7</span><span class="Delimiter">);</span>
 <span id="L229" class="LineNr">229 </span>  <span class="Identifier">return</span> fesetenv<span class="Delimiter">(</span>&amp;fenv<span class="Delimiter">)</span> ? -<span class="Constant">1</span> : old_excepts<span class="Delimiter">;</span>
 <span id="L230" class="LineNr">230 </span><span class="Delimiter">}</span>
-<span id="L231" class="LineNr">231 </span><span class="Comment">#endif</span>
+<span id="L231" class="LineNr">231 </span><span class="PreProc">#endif</span>
 <span id="L232" class="LineNr">232 </span>
 <span id="L233" class="LineNr">233 </span><span class="Comment">//: 6. Map's operator[] being non-const is fucking evil.</span>
 <span id="L234" class="LineNr">234 </span><span class="Delimiter">:(before &quot;Globals&quot;)</span>  <span class="Comment">// can't generate prototypes for these</span>
@@ -336,22 +337,22 @@ if ('onhashchange' in window) {
 <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="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L279" class="LineNr">279 </span><span class="Comment">#include &lt;assert.h&gt;</span>
+<span id="L279" class="LineNr">279 </span><span class="PreProc">#include </span><span class="Constant">&lt;assert.h&gt;</span>
 <span id="L280" class="LineNr">280 </span>
-<span id="L281" class="LineNr">281 </span><span class="Comment">#include &lt;iostream&gt;</span>
+<span id="L281" class="LineNr">281 </span><span class="PreProc">#include </span><span class="Constant">&lt;iostream&gt;</span>
 <span id="L282" class="LineNr">282 </span><span class="Normal">using</span> std::istream<span class="Delimiter">;</span>
 <span id="L283" class="LineNr">283 </span><span class="Normal">using</span> std::ostream<span class="Delimiter">;</span>
 <span id="L284" class="LineNr">284 </span><span class="Normal">using</span> std::iostream<span class="Delimiter">;</span>
 <span id="L285" class="LineNr">285 </span><span class="Normal">using</span> std::cin<span class="Delimiter">;</span>
 <span id="L286" class="LineNr">286 </span><span class="Normal">using</span> std::cout<span class="Delimiter">;</span>
 <span id="L287" class="LineNr">287 </span><span class="Normal">using</span> std::cerr<span class="Delimiter">;</span>
-<span id="L288" class="LineNr">288 </span><span class="Comment">#include &lt;iomanip&gt;</span>
+<span id="L288" class="LineNr">288 </span><span class="PreProc">#include </span><span class="Constant">&lt;iomanip&gt;</span>
 <span id="L289" class="LineNr">289 </span>
-<span id="L290" class="LineNr">290 </span><span class="Comment">#include &lt;string.h&gt;</span>
-<span id="L291" class="LineNr">291 </span><span class="Comment">#include &lt;string&gt;</span>
+<span id="L290" class="LineNr">290 </span><span class="PreProc">#include </span><span class="Constant">&lt;string.h&gt;</span>
+<span id="L291" class="LineNr">291 </span><span class="PreProc">#include </span><span class="Constant">&lt;string&gt;</span>
 <span id="L292" class="LineNr">292 </span><span class="Normal">using</span> std::string<span class="Delimiter">;</span>
 <span id="L293" class="LineNr">293 </span>
-<span id="L294" class="LineNr">294 </span><span class="Comment">#include &lt;algorithm&gt;</span>
+<span id="L294" class="LineNr">294 </span><span class="PreProc">#include </span><span class="Constant">&lt;algorithm&gt;</span>
 <span id="L295" class="LineNr">295 </span><span class="Normal">using</span> std::min<span class="Delimiter">;</span>
 <span id="L296" class="LineNr">296 </span><span class="Normal">using</span> std::max<span class="Delimiter">;</span>
 </pre>
diff --git a/html/subx/002test.cc.html b/html/subx/002test.cc.html
index 6580efac..2948d28a 100644
--- a/html/subx/002test.cc.html
+++ b/html/subx/002test.cc.html
@@ -14,15 +14,16 @@ pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-
 body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
-.CommentedCode { color: #8a8a8a; }
+.cSpecial { color: #008000; }
 .LineNr { }
 .Constant { color: #008787; }
+.CommentedCode { color: #8a8a8a; }
 .Delimiter { color: #c000c0; }
 .Special { color: #d70000; }
 .Identifier { color: #af5f00; }
 .Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 .Comment { color: #005faf; }
-.cSpecial { color: #008000; }
+.PreProc { color: #c000c0; }
 -->
 </style>
 
@@ -73,35 +74,35 @@ if ('onhashchange' in window) {
 <span id="L13" class="LineNr"> 13 </span><span class="Delimiter">:(before &quot;Globals&quot;)</span>
 <span id="L14" class="LineNr"> 14 </span><span class="Comment">// move a global ahead into types that we can't generate an extern declaration for</span>
 <span id="L15" class="LineNr"> 15 </span><span class="Normal">const</span> <a href='002test.cc.html#L12'>test_fn</a> <span class="Special"><a href='002test.cc.html#L15'>Tests</a></span>[] = <span class="Delimiter">{</span>
-<span id="L16" class="LineNr"> 16 </span>  <span class="Comment">#include &quot;test_list&quot;  // auto-generated; see 'build*' scripts</span>
+<span id="L16" class="LineNr"> 16 </span>  <span class="PreProc">#include </span><span class="Constant">&quot;test_list&quot;</span>  <span class="Comment">// auto-generated; see 'build*' scripts</span>
 <span id="L17" class="LineNr"> 17 </span><span class="Delimiter">};</span>
 <span id="L18" class="LineNr"> 18 </span>
 <span id="L19" class="LineNr"> 19 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L20" class="LineNr"> 20 </span><span class="Normal">bool</span> <span class="Special"><a href='002test.cc.html#L20'>Run_tests</a></span> =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L21" class="LineNr"> 21 </span><span class="Normal">bool</span> <span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> =<span class="Constant"> true</span><span class="Delimiter">;</span>  <span class="Comment">// set this to false inside any test to indicate failure</span>
+<span id="L20" class="LineNr"> 20 </span><span class="Normal">bool</span> <span class="Special"><a href='002test.cc.html#L20'>Run_tests</a></span> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L21" class="LineNr"> 21 </span><span class="Normal">bool</span> <span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> = <span class="Constant">true</span><span class="Delimiter">;</span>  <span class="Comment">// set this to false inside any test to indicate failure</span>
 <span id="L22" class="LineNr"> 22 </span>
 <span id="L23" class="LineNr"> 23 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L24" class="LineNr"> 24 </span><span class="Comment">#define CHECK(X) \</span>
-<span id="L25" class="LineNr"> 25 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> &amp;&amp; !<span class="Delimiter">(</span><span class="Special">X</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> \
-<span id="L26" class="LineNr"> 26 </span>    cerr &lt;&lt; <span class="Constant">&quot;\nF - &quot;</span> &lt;&lt; __FUNCTION__ &lt;&lt; <span class="Constant">&quot;(&quot;</span> &lt;&lt; <span class="Constant">__FILE__</span> &lt;&lt; <span class="Constant">&quot;:&quot;</span> &lt;&lt; <span class="Constant">__LINE__</span> &lt;&lt; <span class="Constant">&quot;): &quot;</span> &lt;&lt; <span class="Comment">#X &lt;&lt; '\n'; \</span>
-<span id="L27" class="LineNr"> 27 </span>    <span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> =<span class="Constant"> false</span><span class="Delimiter">;</span> \
-<span id="L28" class="LineNr"> 28 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">/*</span><span class="Comment"> Currently we stop at the very first failure. </span><span class="Comment">*/</span> \
-<span id="L29" class="LineNr"> 29 </span>  <span class="Delimiter">}</span>
+<span id="L24" class="LineNr"> 24 </span><span class="PreProc">#define CHECK(</span><span class="Special">X</span><span class="PreProc">) \</span>
+<span id="L25" class="LineNr"> 25 </span><span class="PreProc">  </span><span class="Normal">if</span><span class="PreProc"> (</span><span class="Special"><a href='002test.cc.html#L21'>Passed</a></span><span class="PreProc"> &amp;&amp; !(</span><span class="Special">X</span><span class="PreProc">)) </span><span class="Delimiter">{</span><span class="PreProc"> \</span>
+<span id="L26" class="LineNr"> 26 </span><span class="PreProc">    cerr &lt;&lt; </span><span class="Constant">&quot;\nF - &quot;</span><span class="PreProc"> &lt;&lt; __FUNCTION__ &lt;&lt; </span><span class="Constant">&quot;(&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__FILE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;:&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__LINE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;): &quot;</span><span class="PreProc"> &lt;&lt; #</span><span class="Special">X</span><span class="PreProc"> &lt;&lt; </span><span class="cSpecial">'\n'</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L27" class="LineNr"> 27 </span><span class="PreProc">    </span><span class="Special"><a href='002test.cc.html#L21'>Passed</a></span><span class="PreProc"> = </span><span class="Constant">false</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L28" class="LineNr"> 28 </span><span class="PreProc">    </span><span class="Identifier">return</span><span class="Delimiter">;</span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> Currently we stop at the very first failure. </span><span class="Comment">*/</span><span class="PreProc"> \</span>
+<span id="L29" class="LineNr"> 29 </span><span class="PreProc">  </span><span class="Delimiter">}</span>
 <span id="L30" class="LineNr"> 30 </span>
-<span id="L31" class="LineNr"> 31 </span><span class="Comment">#define CHECK_EQ(X, Y) \</span>
-<span id="L32" class="LineNr"> 32 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> &amp;&amp; <span class="Delimiter">(</span><span class="Special">X</span><span class="Delimiter">)</span> != <span class="Delimiter">(</span><span class="Special">Y</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> \
-<span id="L33" class="LineNr"> 33 </span>    cerr &lt;&lt; <span class="Constant">&quot;\nF - &quot;</span> &lt;&lt; __FUNCTION__ &lt;&lt; <span class="Constant">&quot;(&quot;</span> &lt;&lt; <span class="Constant">__FILE__</span> &lt;&lt; <span class="Constant">&quot;:&quot;</span> &lt;&lt; <span class="Constant">__LINE__</span> &lt;&lt; <span class="Constant">&quot;): &quot;</span> &lt;&lt; <span class="Comment">#X &lt;&lt; &quot; == &quot; &lt;&lt; #Y &lt;&lt; '\n'; \</span>
-<span id="L34" class="LineNr"> 34 </span>    cerr &lt;&lt; <span class="Constant">&quot;  got &quot;</span> &lt;&lt; <span class="Delimiter">(</span><span class="Special">X</span><span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>  <span class="Comment">/*</span><span class="Comment"> BEWARE: multiple eval </span><span class="Comment">*/</span> \
-<span id="L35" class="LineNr"> 35 </span>    <span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> =<span class="Constant"> false</span><span class="Delimiter">;</span> \
-<span id="L36" class="LineNr"> 36 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">/*</span><span class="Comment"> Currently we stop at the very first failure. </span><span class="Comment">*/</span> \
-<span id="L37" class="LineNr"> 37 </span>  <span class="Delimiter">}</span>
+<span id="L31" class="LineNr"> 31 </span><span class="PreProc">#define CHECK_EQ(</span><span class="Special">X</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Special">Y</span><span class="PreProc">) \</span>
+<span id="L32" class="LineNr"> 32 </span><span class="PreProc">  </span><span class="Normal">if</span><span class="PreProc"> (</span><span class="Special"><a href='002test.cc.html#L21'>Passed</a></span><span class="PreProc"> &amp;&amp; (</span><span class="Special">X</span><span class="PreProc">) != (</span><span class="Special">Y</span><span class="PreProc">)) </span><span class="Delimiter">{</span><span class="PreProc"> \</span>
+<span id="L33" class="LineNr"> 33 </span><span class="PreProc">    cerr &lt;&lt; </span><span class="Constant">&quot;\nF - &quot;</span><span class="PreProc"> &lt;&lt; __FUNCTION__ &lt;&lt; </span><span class="Constant">&quot;(&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__FILE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;:&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__LINE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;): &quot;</span><span class="PreProc"> &lt;&lt; #</span><span class="Special">X</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot; == &quot;</span><span class="PreProc"> &lt;&lt; #</span><span class="Special">Y</span><span class="PreProc"> &lt;&lt; </span><span class="cSpecial">'\n'</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L34" class="LineNr"> 34 </span><span class="PreProc">    cerr &lt;&lt; </span><span class="Constant">&quot;  got &quot;</span><span class="PreProc"> &lt;&lt; (</span><span class="Special">X</span><span class="PreProc">) &lt;&lt; </span><span class="cSpecial">'\n'</span><span class="Delimiter">;</span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> BEWARE: multiple eval </span><span class="Comment">*/</span><span class="PreProc"> \</span>
+<span id="L35" class="LineNr"> 35 </span><span class="PreProc">    </span><span class="Special"><a href='002test.cc.html#L21'>Passed</a></span><span class="PreProc"> = </span><span class="Constant">false</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L36" class="LineNr"> 36 </span><span class="PreProc">    </span><span class="Identifier">return</span><span class="Delimiter">;</span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> Currently we stop at the very first failure. </span><span class="Comment">*/</span><span class="PreProc"> \</span>
+<span id="L37" class="LineNr"> 37 </span><span class="PreProc">  </span><span class="Delimiter">}</span>
 <span id="L38" class="LineNr"> 38 </span>
 <span id="L39" class="LineNr"> 39 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
-<span id="L40" class="LineNr"> 40 </span><span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> =<span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L40" class="LineNr"> 40 </span><span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> = <span class="Constant">true</span><span class="Delimiter">;</span>
 <span id="L41" class="LineNr"> 41 </span>
 <span id="L42" class="LineNr"> 42 </span><span class="Delimiter">:(before &quot;End Commandline Parsing&quot;)</span>
 <span id="L43" class="LineNr"> 43 </span><span class="Normal">if</span> <span class="Delimiter">(</span>argc &gt; <span class="Constant">1</span> &amp;&amp; <a href='001help.cc.html#L98'>is_equal</a><span class="Delimiter">(</span>argv[<span class="Constant">1</span>]<span class="Delimiter">,</span> <span class="Constant">&quot;test&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L44" class="LineNr"> 44 </span>  <span class="Special"><a href='002test.cc.html#L20'>Run_tests</a></span> =<span class="Constant"> true</span><span class="Delimiter">;</span>  --argc<span class="Delimiter">;</span>  ++argv<span class="Delimiter">;</span>  <span class="Comment">// shift 'test' out of commandline args</span>
+<span id="L44" class="LineNr"> 44 </span>  <span class="Special"><a href='002test.cc.html#L20'>Run_tests</a></span> = <span class="Constant">true</span><span class="Delimiter">;</span>  --argc<span class="Delimiter">;</span>  ++argv<span class="Delimiter">;</span>  <span class="Comment">// shift 'test' out of commandline args</span>
 <span id="L45" class="LineNr"> 45 </span><span class="Delimiter">}</span>
 <span id="L46" class="LineNr"> 46 </span>
 <span id="L47" class="LineNr"> 47 </span><span class="Delimiter">:(before &quot;End Main&quot;)</span>
@@ -153,7 +154,7 @@ if ('onhashchange' in window) {
 <span id="L93" class="LineNr"> 93 </span><span class="Delimiter">:(before &quot;Globals&quot;)</span>
 <span id="L94" class="LineNr"> 94 </span><span class="Comment">// Names for each element of the 'Tests' global, respectively.</span>
 <span id="L95" class="LineNr"> 95 </span><span class="Normal">const</span> string <span class="Special"><a href='002test.cc.html#L95'>Test_names</a></span>[] = <span class="Delimiter">{</span>
-<span id="L96" class="LineNr"> 96 </span>  <span class="Comment">#include &quot;test_name_list&quot;  // auto-generated; see 'build*' scripts</span>
+<span id="L96" class="LineNr"> 96 </span>  <span class="PreProc">#include </span><span class="Constant">&quot;test_name_list&quot;</span>  <span class="Comment">// auto-generated; see 'build*' scripts</span>
 <span id="L97" class="LineNr"> 97 </span><span class="Delimiter">};</span>
 <span id="L98" class="LineNr"> 98 </span><span class="Delimiter">:(after &quot;Test Runs&quot;)</span>
 <span id="L99" class="LineNr"> 99 </span>string <a href='002test.cc.html#L99'>maybe_single_test_to_run</a> = argv[argc-<span class="Constant">1</span>]<span class="Delimiter">;</span>
@@ -168,7 +169,7 @@ if ('onhashchange' in window) {
 <span id="L108" class="LineNr">108 </span><span class="Delimiter">}</span>
 <span id="L109" class="LineNr">109 </span>
 <span id="L110" class="LineNr">110 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L111" class="LineNr">111 </span><span class="Comment">#include &lt;stdlib.h&gt;</span>
+<span id="L111" class="LineNr">111 </span><span class="PreProc">#include </span><span class="Constant">&lt;stdlib.h&gt;</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/003trace.cc.html b/html/subx/003trace.cc.html
index 71df6c71..4fd9723f 100644
--- a/html/subx/003trace.cc.html
+++ b/html/subx/003trace.cc.html
@@ -15,6 +15,7 @@ body { font-size:12pt; font-family: monospace; color: #000000; background-color:
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
 .cSpecial { color: #008000; }
+.PreProc { color: #c000c0; }
 .LineNr { }
 .Constant { color: #008787; }
 .Delimiter { color: #c000c0; }
@@ -76,460 +77,483 @@ if ('onhashchange' in window) {
 <span id="L16" class="LineNr"> 16 </span><span class="Comment">//: In response, this layer introduces the notion of domain-driven *white-box*</span>
 <span id="L17" class="LineNr"> 17 </span><span class="Comment">//: testing. We focus on the domain of inputs the whole program needs to</span>
 <span id="L18" class="LineNr"> 18 </span><span class="Comment">//: handle rather than the correctness of individual functions. All white-box</span>
-<span id="L19" class="LineNr"> 19 </span><span class="Comment">//: tests (we call them 'scenarios') invoke the program in a single way: by</span>
-<span id="L20" class="LineNr"> 20 </span><span class="Comment">//: calling run() with some input. As the program operates on the input, it</span>
-<span id="L21" class="LineNr"> 21 </span><span class="Comment">//: traces out a list of _facts_ deduced about the domain:</span>
+<span id="L19" class="LineNr"> 19 </span><span class="Comment">//: tests invoke the program in a single way: by calling run() with some</span>
+<span id="L20" class="LineNr"> 20 </span><span class="Comment">//: input. As the program operates on the input, it traces out a list of</span>
+<span id="L21" class="LineNr"> 21 </span><span class="Comment">//: _facts_ deduced about the domain:</span>
 <span id="L22" class="LineNr"> 22 </span><span class="Comment">//:   trace(&quot;label&quot;) &lt;&lt; &quot;fact 1: &quot; &lt;&lt; val;</span>
 <span id="L23" class="LineNr"> 23 </span><span class="Comment">//:</span>
-<span id="L24" class="LineNr"> 24 </span><span class="Comment">//: Scenarios can now check these facts:</span>
-<span id="L25" class="LineNr"> 25 </span><span class="Comment">//:   :(scenario foo)</span>
-<span id="L26" class="LineNr"> 26 </span><span class="Comment">//:   34  # call run() with this input</span>
-<span id="L27" class="LineNr"> 27 </span><span class="Comment">//:   +label: fact 1: 34  # 'run' should have deduced this fact</span>
-<span id="L28" class="LineNr"> 28 </span><span class="Comment">//:   -label: fact 1: 35  # the trace should not contain such a fact</span>
-<span id="L29" class="LineNr"> 29 </span><span class="Comment">//:</span>
-<span id="L30" class="LineNr"> 30 </span><span class="Comment">//: Since we never call anything but the run() function directly, we never have</span>
-<span id="L31" class="LineNr"> 31 </span><span class="Comment">//: to rewrite the scenarios when we reorganize the internals of the program. We</span>
-<span id="L32" class="LineNr"> 32 </span><span class="Comment">//: just have to make sure our rewrite deduces the same facts about the domain,</span>
-<span id="L33" class="LineNr"> 33 </span><span class="Comment">//: and that's something we're going to have to do anyway.</span>
-<span id="L34" class="LineNr"> 34 </span><span class="Comment">//:</span>
-<span id="L35" class="LineNr"> 35 </span><span class="Comment">//: To avoid the combinatorial explosion of integration tests, each layer</span>
-<span id="L36" class="LineNr"> 36 </span><span class="Comment">//: mainly logs facts to the trace with a common *label*. All scenarios in a</span>
-<span id="L37" class="LineNr"> 37 </span><span class="Comment">//: layer tend to check facts with this label. Validating the facts logged</span>
-<span id="L38" class="LineNr"> 38 </span><span class="Comment">//: with a specific label is like calling functions of that layer directly.</span>
-<span id="L39" class="LineNr"> 39 </span><span class="Comment">//:</span>
-<span id="L40" class="LineNr"> 40 </span><span class="Comment">//: To build robust scenarios, trace facts about your domain rather than details of</span>
-<span id="L41" class="LineNr"> 41 </span><span class="Comment">//: how you computed them.</span>
+<span id="L24" class="LineNr"> 24 </span><span class="Comment">//: Tests can now check for these facts in the trace:</span>
+<span id="L25" class="LineNr"> 25 </span><span class="Comment">//:   CHECK_TRACE_CONTENTS(&quot;label&quot;, &quot;fact 1: 34\n&quot;</span>
+<span id="L26" class="LineNr"> 26 </span><span class="Comment">//:                                 &quot;fact 2: 35\n&quot;);</span>
+<span id="L27" class="LineNr"> 27 </span><span class="Comment">//:</span>
+<span id="L28" class="LineNr"> 28 </span><span class="Comment">//: Since we never call anything but the run() function directly, we never have</span>
+<span id="L29" class="LineNr"> 29 </span><span class="Comment">//: to rewrite the tests when we reorganize the internals of the program. We</span>
+<span id="L30" class="LineNr"> 30 </span><span class="Comment">//: just have to make sure our rewrite deduces the same facts about the domain,</span>
+<span id="L31" class="LineNr"> 31 </span><span class="Comment">//: and that's something we're going to have to do anyway.</span>
+<span id="L32" class="LineNr"> 32 </span><span class="Comment">//:</span>
+<span id="L33" class="LineNr"> 33 </span><span class="Comment">//: To avoid the combinatorial explosion of integration tests, each layer</span>
+<span id="L34" class="LineNr"> 34 </span><span class="Comment">//: mainly logs facts to the trace with a common *label*. All tests in a layer</span>
+<span id="L35" class="LineNr"> 35 </span><span class="Comment">//: tend to check facts with this label. Validating the facts logged with a</span>
+<span id="L36" class="LineNr"> 36 </span><span class="Comment">//: specific label is like calling functions of that layer directly.</span>
+<span id="L37" class="LineNr"> 37 </span><span class="Comment">//:</span>
+<span id="L38" class="LineNr"> 38 </span><span class="Comment">//: To build robust tests, trace facts about your domain rather than details of</span>
+<span id="L39" class="LineNr"> 39 </span><span class="Comment">//: how you computed them.</span>
+<span id="L40" class="LineNr"> 40 </span><span class="Comment">//:</span>
+<span id="L41" class="LineNr"> 41 </span><span class="Comment">//: More details: <a href="http://akkartik.name/blog/tracing-tests">http://akkartik.name/blog/tracing-tests</a></span>
 <span id="L42" class="LineNr"> 42 </span><span class="Comment">//:</span>
-<span id="L43" class="LineNr"> 43 </span><span class="Comment">//: More details: <a href="http://akkartik.name/blog/tracing-tests">http://akkartik.name/blog/tracing-tests</a></span>
+<span id="L43" class="LineNr"> 43 </span><span class="Comment">//: ---</span>
 <span id="L44" class="LineNr"> 44 </span><span class="Comment">//:</span>
-<span id="L45" class="LineNr"> 45 </span><span class="Comment">//: ---</span>
-<span id="L46" class="LineNr"> 46 </span><span class="Comment">//:</span>
-<span id="L47" class="LineNr"> 47 </span><span class="Comment">//: Between layers and domain-driven testing, programming starts to look like a</span>
-<span id="L48" class="LineNr"> 48 </span><span class="Comment">//: fundamentally different activity. Instead of focusing on a) superficial,</span>
-<span id="L49" class="LineNr"> 49 </span><span class="Comment">//: b) local rules on c) code [like say <a href="http://blog.bbv.ch/2013/06/05/clean-code-cheat-sheet">http://blog.bbv.ch/2013/06/05/clean-code-cheat-sheet</a>],</span>
-<span id="L50" class="LineNr"> 50 </span><span class="Comment">//: we allow programmers to engage with the a) deep, b) global structure of</span>
-<span id="L51" class="LineNr"> 51 </span><span class="Comment">//: the c) domain. If you can systematically track discontinuities in the</span>
-<span id="L52" class="LineNr"> 52 </span><span class="Comment">//: domain, you don't care if the code used gotos as long as it passed all</span>
-<span id="L53" class="LineNr"> 53 </span><span class="Comment">//: scenarios. If scenarios become more robust to run, it becomes easier to</span>
-<span id="L54" class="LineNr"> 54 </span><span class="Comment">//: try out radically different implementations for the same program. If code</span>
-<span id="L55" class="LineNr"> 55 </span><span class="Comment">//: is super-easy to rewrite, it becomes less important what indentation style</span>
-<span id="L56" class="LineNr"> 56 </span><span class="Comment">//: it uses, or that the objects are appropriately encapsulated, or that the</span>
-<span id="L57" class="LineNr"> 57 </span><span class="Comment">//: functions are referentially transparent.</span>
-<span id="L58" class="LineNr"> 58 </span><span class="Comment">//:</span>
-<span id="L59" class="LineNr"> 59 </span><span class="Comment">//: Instead of plumbing, programming becomes building and gradually refining a</span>
-<span id="L60" class="LineNr"> 60 </span><span class="Comment">//: map of the environment the program must operate under. Whether a program</span>
-<span id="L61" class="LineNr"> 61 </span><span class="Comment">//: is 'correct' at a given point in time is a red herring; what matters is</span>
-<span id="L62" class="LineNr"> 62 </span><span class="Comment">//: avoiding regression by monotonically nailing down the more 'eventful'</span>
-<span id="L63" class="LineNr"> 63 </span><span class="Comment">//: parts of the terrain. It helps readers new and old, and rewards curiosity,</span>
-<span id="L64" class="LineNr"> 64 </span><span class="Comment">//: to organize large programs in self-similar hierarchies of example scenarios</span>
-<span id="L65" class="LineNr"> 65 </span><span class="Comment">//: colocated with the code that makes them work.</span>
-<span id="L66" class="LineNr"> 66 </span><span class="Comment">//:</span>
-<span id="L67" class="LineNr"> 67 </span><span class="Comment">//:   &quot;Programming properly should be regarded as an activity by which</span>
-<span id="L68" class="LineNr"> 68 </span><span class="Comment">//:   programmers form a mental model, rather than as production of a program.&quot;</span>
-<span id="L69" class="LineNr"> 69 </span><span class="Comment">//:   -- Peter Naur (<a href="http://alistair.cockburn.us/ASD+book+extract%3A+%22Naur,+Ehn,+Musashi%22">http://alistair.cockburn.us/ASD+book+extract%3A+%22Naur,+Ehn,+Musashi%22</a>)</span>
+<span id="L45" class="LineNr"> 45 </span><span class="Comment">//: Between layers and domain-driven testing, programming starts to look like a</span>
+<span id="L46" class="LineNr"> 46 </span><span class="Comment">//: fundamentally different activity. Instead of focusing on a) superficial,</span>
+<span id="L47" class="LineNr"> 47 </span><span class="Comment">//: b) local rules on c) code [like say <a href="http://blog.bbv.ch/2013/06/05/clean-code-cheat-sheet">http://blog.bbv.ch/2013/06/05/clean-code-cheat-sheet</a>],</span>
+<span id="L48" class="LineNr"> 48 </span><span class="Comment">//: we allow programmers to engage with the a) deep, b) global structure of</span>
+<span id="L49" class="LineNr"> 49 </span><span class="Comment">//: the c) domain. If you can systematically track discontinuities in the</span>
+<span id="L50" class="LineNr"> 50 </span><span class="Comment">//: domain, you don't care if the code used gotos as long as it passed all</span>
+<span id="L51" class="LineNr"> 51 </span><span class="Comment">//: tests. If tests become more robust to run, it becomes easier to try out</span>
+<span id="L52" class="LineNr"> 52 </span><span class="Comment">//: radically different implementations for the same program. If code is</span>
+<span id="L53" class="LineNr"> 53 </span><span class="Comment">//: super-easy to rewrite, it becomes less important what indentation style it</span>
+<span id="L54" class="LineNr"> 54 </span><span class="Comment">//: uses, or that the objects are appropriately encapsulated, or that the</span>
+<span id="L55" class="LineNr"> 55 </span><span class="Comment">//: functions are referentially transparent.</span>
+<span id="L56" class="LineNr"> 56 </span><span class="Comment">//:</span>
+<span id="L57" class="LineNr"> 57 </span><span class="Comment">//: Instead of plumbing, programming becomes building and gradually refining a</span>
+<span id="L58" class="LineNr"> 58 </span><span class="Comment">//: map of the environment the program must operate under. Whether a program</span>
+<span id="L59" class="LineNr"> 59 </span><span class="Comment">//: is 'correct' at a given point in time is a red herring; what matters is</span>
+<span id="L60" class="LineNr"> 60 </span><span class="Comment">//: avoiding regression by monotonically nailing down the more 'eventful'</span>
+<span id="L61" class="LineNr"> 61 </span><span class="Comment">//: parts of the terrain. It helps readers new and old, and rewards curiosity,</span>
+<span id="L62" class="LineNr"> 62 </span><span class="Comment">//: to organize large programs in self-similar hierarchies of example tests</span>
+<span id="L63" class="LineNr"> 63 </span><span class="Comment">//: colocated with the code that makes them work.</span>
+<span id="L64" class="LineNr"> 64 </span><span class="Comment">//:</span>
+<span id="L65" class="LineNr"> 65 </span><span class="Comment">//:   &quot;Programming properly should be regarded as an activity by which</span>
+<span id="L66" class="LineNr"> 66 </span><span class="Comment">//:   programmers form a mental model, rather than as production of a program.&quot;</span>
+<span id="L67" class="LineNr"> 67 </span><span class="Comment">//:   -- Peter Naur (<a href="http://alistair.cockburn.us/ASD+book+extract%3A+%22Naur,+Ehn,+Musashi%22">http://alistair.cockburn.us/ASD+book+extract%3A+%22Naur,+Ehn,+Musashi%22</a>)</span>
+<span id="L68" class="LineNr"> 68 </span>
+<span id="L69" class="LineNr"> 69 </span><span class="SalientComment">//:: == Core data structures</span>
 <span id="L70" class="LineNr"> 70 </span>
-<span id="L71" class="LineNr"> 71 </span><span class="SalientComment">//:: == Core data structures</span>
-<span id="L72" class="LineNr"> 72 </span>
-<span id="L73" class="LineNr"> 73 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L74" class="LineNr"> 74 </span>trace_stream* <span class="Special"><a href='003trace.cc.html#L74'>Trace_stream</a></span> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L75" class="LineNr"> 75 </span>
-<span id="L76" class="LineNr"> 76 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L77" class="LineNr"> 77 </span><span class="Normal">struct</span> trace_stream <span class="Delimiter">{</span>
-<span id="L78" class="LineNr"> 78 </span>  vector&lt;trace_line&gt; <a href='003trace.cc.html#L78'>past_lines</a><span class="Delimiter">;</span>
-<span id="L79" class="LineNr"> 79 </span>  <span class="Comment">// End trace_stream Fields</span>
-<span id="L80" class="LineNr"> 80 </span>
-<span id="L81" class="LineNr"> 81 </span>  trace_stream<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L82" class="LineNr"> 82 </span>    <span class="Comment">// End trace_stream Constructor</span>
-<span id="L83" class="LineNr"> 83 </span>  <span class="Delimiter">}</span>
-<span id="L84" class="LineNr"> 84 </span>  <a href='003trace.cc.html#L84'>~trace_stream</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L85" class="LineNr"> 85 </span>    <span class="Comment">// End trace_stream Destructor</span>
-<span id="L86" class="LineNr"> 86 </span>  <span class="Delimiter">}</span>
-<span id="L87" class="LineNr"> 87 </span>  <span class="Comment">// End trace_stream Methods</span>
-<span id="L88" class="LineNr"> 88 </span><span class="Delimiter">};</span>
+<span id="L71" class="LineNr"> 71 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L72" class="LineNr"> 72 </span>trace_stream* <span class="Special"><a href='003trace.cc.html#L72'>Trace_stream</a></span> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L73" class="LineNr"> 73 </span>
+<span id="L74" class="LineNr"> 74 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L75" class="LineNr"> 75 </span><span class="Normal">struct</span> trace_stream <span class="Delimiter">{</span>
+<span id="L76" class="LineNr"> 76 </span>  vector&lt;trace_line&gt; <a href='003trace.cc.html#L76'>past_lines</a><span class="Delimiter">;</span>
+<span id="L77" class="LineNr"> 77 </span>  <span class="Comment">// End trace_stream Fields</span>
+<span id="L78" class="LineNr"> 78 </span>
+<span id="L79" class="LineNr"> 79 </span>  trace_stream<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L80" class="LineNr"> 80 </span>    <span class="Comment">// End trace_stream Constructor</span>
+<span id="L81" class="LineNr"> 81 </span>  <span class="Delimiter">}</span>
+<span id="L82" class="LineNr"> 82 </span>  <a href='003trace.cc.html#L82'>~trace_stream</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L83" class="LineNr"> 83 </span>    <span class="Comment">// End trace_stream Destructor</span>
+<span id="L84" class="LineNr"> 84 </span>  <span class="Delimiter">}</span>
+<span id="L85" class="LineNr"> 85 </span>  <span class="Comment">// End trace_stream Methods</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="SalientComment">//:: == Adding to the trace</span>
 <span id="L89" class="LineNr"> 89 </span>
-<span id="L90" class="LineNr"> 90 </span><span class="SalientComment">//:: == Adding to the trace</span>
-<span id="L91" class="LineNr"> 91 </span>
-<span id="L92" class="LineNr"> 92 </span><span class="Comment">//: Top-level method is trace() which can be used like an ostream. Usage:</span>
-<span id="L93" class="LineNr"> 93 </span><span class="Comment">//:   trace(depth, label) &lt;&lt; ... &lt;&lt; end();</span>
-<span id="L94" class="LineNr"> 94 </span><span class="Comment">//: Don't forget the 'end()' to actually append to the trace.</span>
-<span id="L95" class="LineNr"> 95 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L96" class="LineNr"> 96 </span><span class="Comment">// No brackets around the expansion so that it prints nothing if Trace_stream</span>
-<span id="L97" class="LineNr"> 97 </span><span class="Comment">// isn't initialized.</span>
-<span id="L98" class="LineNr"> 98 </span><span class="Comment">#define trace(...)  !Trace_stream ? cerr : Trace_stream-&gt;stream(__VA_ARGS__)</span>
-<span id="L99" class="LineNr"> 99 </span>
-<span id="L100" class="LineNr">100 </span><span class="Delimiter">:(before &quot;End trace_stream Fields&quot;)</span>
-<span id="L101" class="LineNr">101 </span><span class="Comment">// accumulator for current trace_line</span>
-<span id="L102" class="LineNr">102 </span>ostringstream* curr_stream<span class="Delimiter">;</span>
-<span id="L103" class="LineNr">103 </span>string <a href='003trace.cc.html#L103'>curr_label</a><span class="Delimiter">;</span>
-<span id="L104" class="LineNr">104 </span><span class="Normal">int</span> <a href='003trace.cc.html#L104'>curr_depth</a><span class="Delimiter">;</span>
-<span id="L105" class="LineNr">105 </span><span class="Comment">// other stuff</span>
-<span id="L106" class="LineNr">106 </span><span class="Normal">int</span> <a href='003trace.cc.html#L106'>collect_depth</a><span class="Delimiter">;</span>  <span class="Comment">// avoid tracing lower levels for speed</span>
-<span id="L107" class="LineNr">107 </span>ofstream<span class="Constant"> null</span>_stream<span class="Delimiter">;</span>  <span class="Comment">// never opened, so writes to it silently fail</span>
-<span id="L108" class="LineNr">108 </span>
-<span id="L109" class="LineNr">109 </span><span class="Comment">//: Some constants.</span>
-<span id="L110" class="LineNr">110 </span><span class="Delimiter">:(before &quot;struct trace_stream&quot;)</span>  <span class="Comment">// include constants in all cleaved compilation units</span>
-<span id="L111" class="LineNr">111 </span><span class="Normal">const</span> <span class="Normal">int</span> <span class="Special"><a href='003trace.cc.html#L111'>Max_depth</a></span> = <span class="Constant">9999</span><span class="Delimiter">;</span>
-<span id="L112" class="LineNr">112 </span><span class="Comment">// Most important traces are printed to the screen by default</span>
-<span id="L113" class="LineNr">113 </span><span class="Normal">const</span> <span class="Normal">int</span> <span class="Special"><a href='003trace.cc.html#L113'>Error_depth</a></span> = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L114" class="LineNr">114 </span><span class="Normal">const</span> <span class="Normal">int</span> <span class="Special"><a href='003trace.cc.html#L114'>Warn_depth</a></span> = <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L115" class="LineNr">115 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L116" class="LineNr">116 </span><span class="Normal">int</span> <span class="Special">Hide_errors</span> =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// if set, don't print errors or warnings to screen</span>
-<span id="L117" class="LineNr">117 </span><span class="Normal">int</span> <span class="Special">Hide_warnings</span> =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// if set, don't print warnings to screen</span>
-<span id="L118" class="LineNr">118 </span><span class="Delimiter">:(before &quot;End trace_stream Constructor&quot;)</span>
-<span id="L119" class="LineNr">119 </span>curr_stream = <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L120" class="LineNr">120 </span><a href='003trace.cc.html#L104'>curr_depth</a> = <span class="Special"><a href='003trace.cc.html#L111'>Max_depth</a></span><span class="Delimiter">;</span>
-<span id="L121" class="LineNr">121 </span><a href='003trace.cc.html#L106'>collect_depth</a> = <span class="Special"><a href='003trace.cc.html#L111'>Max_depth</a></span><span class="Delimiter">;</span>
-<span id="L122" class="LineNr">122 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
-<span id="L123" class="LineNr">123 </span><span class="Special">Hide_errors</span> =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L124" class="LineNr">124 </span><span class="Special">Hide_warnings</span> =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L125" class="LineNr">125 </span><span class="Comment">//: Never dump warnings in scenarios</span>
-<span id="L126" class="LineNr">126 </span><span class="Delimiter">:(before &quot;End Test Setup&quot;)</span>
-<span id="L127" class="LineNr">127 </span><span class="Special">Hide_warnings</span> =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L128" class="LineNr">128 </span>
-<span id="L129" class="LineNr">129 </span><span class="Delimiter">:(before &quot;struct trace_stream&quot;)</span>
-<span id="L130" class="LineNr">130 </span><span class="Normal">struct</span> trace_line <span class="Delimiter">{</span>
-<span id="L131" class="LineNr">131 </span>  string <a href='003trace.cc.html#L131'>contents</a><span class="Delimiter">;</span>
-<span id="L132" class="LineNr">132 </span>  string label<span class="Delimiter">;</span>
-<span id="L133" class="LineNr">133 </span>  <span class="Normal">int</span> <a href='003trace.cc.html#L133'>depth</a><span class="Delimiter">;</span>  <span class="Comment">// 0 is 'sea level'; positive integers are progressively 'deeper' and lower level</span>
-<span id="L134" class="LineNr">134 </span>  trace_line<span class="Delimiter">(</span>string c<span class="Delimiter">,</span> string l<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L135" class="LineNr">135 </span>    <a href='003trace.cc.html#L131'>contents</a> = c<span class="Delimiter">;</span>
-<span id="L136" class="LineNr">136 </span>    label = l<span class="Delimiter">;</span>
-<span id="L137" class="LineNr">137 </span>    <a href='003trace.cc.html#L133'>depth</a> = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L138" class="LineNr">138 </span>  <span class="Delimiter">}</span>
-<span id="L139" class="LineNr">139 </span>  trace_line<span class="Delimiter">(</span>string c<span class="Delimiter">,</span> string l<span class="Delimiter">,</span> <span class="Normal">int</span> d<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L140" class="LineNr">140 </span>    <a href='003trace.cc.html#L131'>contents</a> = c<span class="Delimiter">;</span>
-<span id="L141" class="LineNr">141 </span>    label = l<span class="Delimiter">;</span>
-<span id="L142" class="LineNr">142 </span>    <a href='003trace.cc.html#L133'>depth</a> = d<span class="Delimiter">;</span>
-<span id="L143" class="LineNr">143 </span>  <span class="Delimiter">}</span>
-<span id="L144" class="LineNr">144 </span><span class="Delimiter">};</span>
-<span id="L145" class="LineNr">145 </span>
-<span id="L146" class="LineNr">146 </span><span class="Comment">//: Starting a new trace line.</span>
-<span id="L147" class="LineNr">147 </span><span class="Delimiter">:(before &quot;End trace_stream Methods&quot;)</span>
-<span id="L148" class="LineNr">148 </span>ostream&amp; stream<span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L149" class="LineNr">149 </span>  <span class="Identifier">return</span> stream<span class="Delimiter">(</span><span class="Special"><a href='003trace.cc.html#L111'>Max_depth</a></span><span class="Delimiter">,</span> label<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>ostream&amp; stream<span class="Delimiter">(</span><span class="Normal">int</span> <a href='003trace.cc.html#L133'>depth</a><span class="Delimiter">,</span> string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L153" class="LineNr">153 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L133'>depth</a> &gt; <a href='003trace.cc.html#L106'>collect_depth</a><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> null</span>_stream<span class="Delimiter">;</span>
-<span id="L154" class="LineNr">154 </span>  curr_stream = <span class="Normal">new</span> ostringstream<span class="Delimiter">;</span>
-<span id="L155" class="LineNr">155 </span>  <a href='003trace.cc.html#L103'>curr_label</a> = label<span class="Delimiter">;</span>
-<span id="L156" class="LineNr">156 </span>  <a href='003trace.cc.html#L104'>curr_depth</a> = <a href='003trace.cc.html#L133'>depth</a><span class="Delimiter">;</span>
-<span id="L157" class="LineNr">157 </span>  <span class="Delimiter">(</span>*curr_stream<span class="Delimiter">)</span> &lt;&lt; std::hex<span class="Delimiter">;</span>  <span class="Comment">// printing addresses is the common case</span>
-<span id="L158" class="LineNr">158 </span>  <span class="Identifier">return</span> *curr_stream<span class="Delimiter">;</span>
-<span id="L159" class="LineNr">159 </span><span class="Delimiter">}</span>
-<span id="L160" class="LineNr">160 </span>
-<span id="L161" class="LineNr">161 </span><span class="Comment">//: End of a trace line; append it to the trace.</span>
-<span id="L162" class="LineNr">162 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L163" class="LineNr">163 </span><span class="Normal">struct</span> end <span class="Delimiter">{};</span>
-<span id="L164" class="LineNr">164 </span><span class="Delimiter">:(code)</span>
-<span id="L165" class="LineNr">165 </span>ostream&amp; <span class="Normal">operator</span>&lt;&lt;<span class="Delimiter">(</span>ostream&amp; os<span class="Delimiter">,</span> end <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L166" class="LineNr">166 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='003trace.cc.html#L74'>Trace_stream</a></span><span class="Delimiter">)</span> <span class="Special"><a href='003trace.cc.html#L74'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L173'>newline</a><span class="Delimiter">();</span>
-<span id="L167" class="LineNr">167 </span>  <span class="Identifier">return</span> os<span class="Delimiter">;</span>
-<span id="L168" class="LineNr">168 </span><span class="Delimiter">}</span>
-<span id="L169" class="LineNr">169 </span>
-<span id="L170" class="LineNr">170 </span><span class="Delimiter">:(before &quot;End trace_stream Methods&quot;)</span>
-<span id="L171" class="LineNr">171 </span><span class="Normal">void</span> <a href='003trace.cc.html#L173'>newline</a><span class="Delimiter">();</span>
-<span id="L172" class="LineNr">172 </span><span class="Delimiter">:(code)</span>
-<span id="L173" class="LineNr">173 </span><span class="Normal">void</span> trace_stream::<a href='003trace.cc.html#L173'>newline</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L174" class="LineNr">174 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr_stream<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L175" class="LineNr">175 </span>  string curr_contents = curr_stream<span class="Delimiter">-&gt;</span>str<span class="Delimiter">();</span>
-<span id="L176" class="LineNr">176 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr_contents<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L177" class="LineNr">177 </span>    <a href='003trace.cc.html#L78'>past_lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>trace_line<span class="Delimiter">(</span>curr_contents<span class="Delimiter">,</span> <a href='003trace.cc.html#L445'>trim</a><span class="Delimiter">(</span><a href='003trace.cc.html#L103'>curr_label</a><span class="Delimiter">),</span> <a href='003trace.cc.html#L104'>curr_depth</a><span class="Delimiter">));</span>  <span class="Comment">// preserve indent in contents</span>
-<span id="L178" class="LineNr">178 </span>    <span class="Comment">// maybe incrementally dump trace</span>
-<span id="L179" class="LineNr">179 </span>    trace_line&amp; t = <a href='003trace.cc.html#L78'>past_lines</a><span class="Delimiter">.</span>back<span class="Delimiter">();</span>
-<span id="L180" class="LineNr">180 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>!<span class="Special">Hide_errors</span> &amp;&amp; <a href='003trace.cc.html#L104'>curr_depth</a> == <span class="Special"><a href='003trace.cc.html#L113'>Error_depth</a></span><span class="Delimiter">)</span>
-<span id="L181" class="LineNr">181 </span>        || <span class="Delimiter">(</span>!<span class="Special">Hide_warnings</span> &amp;&amp; !<span class="Special">Hide_errors</span> &amp;&amp; <a href='003trace.cc.html#L104'>curr_depth</a> == <span class="Special"><a href='003trace.cc.html#L114'>Warn_depth</a></span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L182" class="LineNr">182 </span>      cerr       &lt;&lt; std::setw<span class="Delimiter">(</span><span class="Constant">4</span><span class="Delimiter">)</span> &lt;&lt; t<span class="Delimiter">.</span><a href='003trace.cc.html#L133'>depth</a> &lt;&lt; <span class="Constant">' '</span> &lt;&lt; t<span class="Delimiter">.</span>label &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; t<span class="Delimiter">.</span><a href='003trace.cc.html#L131'>contents</a> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L183" class="LineNr">183 </span>    <span class="Delimiter">}</span>
-<span id="L184" class="LineNr">184 </span>    <span class="Comment">// End trace Commit</span>
-<span id="L185" class="LineNr">185 </span>  <span class="Delimiter">}</span>
-<span id="L186" class="LineNr">186 </span>
-<span id="L187" class="LineNr">187 </span>  <span class="Comment">// clean up</span>
-<span id="L188" class="LineNr">188 </span>  <span class="Normal">delete</span> curr_stream<span class="Delimiter">;</span>
-<span id="L189" class="LineNr">189 </span>  curr_stream = <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L190" class="LineNr">190 </span>  <a href='003trace.cc.html#L103'>curr_label</a><span class="Delimiter">.</span>clear<span class="Delimiter">();</span>
-<span id="L191" class="LineNr">191 </span>  <a href='003trace.cc.html#L104'>curr_depth</a> = <span class="Special"><a href='003trace.cc.html#L111'>Max_depth</a></span><span class="Delimiter">;</span>
-<span id="L192" class="LineNr">192 </span><span class="Delimiter">}</span>
-<span id="L193" class="LineNr">193 </span>
-<span id="L194" class="LineNr">194 </span><span class="SalientComment">//:: == Initializing the trace in scenarios</span>
-<span id="L195" class="LineNr">195 </span>
-<span id="L196" class="LineNr">196 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L197" class="LineNr">197 </span><span class="Comment">#define START_TRACING_UNTIL_END_OF_SCOPE  lease_tracer leased_tracer;</span>
-<span id="L198" class="LineNr">198 </span><span class="Delimiter">:(before &quot;End Test Setup&quot;)</span>
-<span id="L199" class="LineNr">199 </span><a href='003trace.cc.html#L197'>START_TRACING_UNTIL_END_OF_SCOPE</a>
+<span id="L90" class="LineNr"> 90 </span><span class="Comment">//: Top-level method is trace() which can be used like an ostream. Usage:</span>
+<span id="L91" class="LineNr"> 91 </span><span class="Comment">//:   trace(depth, label) &lt;&lt; ... &lt;&lt; end();</span>
+<span id="L92" class="LineNr"> 92 </span><span class="Comment">//: Don't forget the 'end()' to actually append to the trace.</span>
+<span id="L93" class="LineNr"> 93 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L94" class="LineNr"> 94 </span><span class="Comment">// No brackets around the expansion so that it prints nothing if Trace_stream</span>
+<span id="L95" class="LineNr"> 95 </span><span class="Comment">// isn't initialized.</span>
+<span id="L96" class="LineNr"> 96 </span><span class="PreProc">#define trace(</span><span class="Delimiter">...</span><span class="PreProc">)  !</span><span class="Special">Trace_stream</span><span class="PreProc"> ? cerr : </span><span class="Special">Trace_stream</span><span class="Delimiter">-&gt;</span><span class="PreProc">stream(</span><span class="Constant">__VA_ARGS__</span><span class="PreProc">)</span>
+<span id="L97" class="LineNr"> 97 </span>
+<span id="L98" class="LineNr"> 98 </span><span class="Delimiter">:(before &quot;End trace_stream Fields&quot;)</span>
+<span id="L99" class="LineNr"> 99 </span><span class="Comment">// accumulator for current trace_line</span>
+<span id="L100" class="LineNr">100 </span>ostringstream* curr_stream<span class="Delimiter">;</span>
+<span id="L101" class="LineNr">101 </span>string <a href='003trace.cc.html#L101'>curr_label</a><span class="Delimiter">;</span>
+<span id="L102" class="LineNr">102 </span><span class="Normal">int</span> <a href='003trace.cc.html#L102'>curr_depth</a><span class="Delimiter">;</span>
+<span id="L103" class="LineNr">103 </span><span class="Comment">// other stuff</span>
+<span id="L104" class="LineNr">104 </span><span class="Normal">int</span> <a href='003trace.cc.html#L104'>collect_depth</a><span class="Delimiter">;</span>  <span class="Comment">// avoid tracing lower levels for speed</span>
+<span id="L105" class="LineNr">105 </span>ofstream <a href='003trace.cc.html#L105'>null_stream</a><span class="Delimiter">;</span>  <span class="Comment">// never opened, so writes to it silently fail</span>
+<span id="L106" class="LineNr">106 </span>
+<span id="L107" class="LineNr">107 </span><span class="Comment">//: Some constants.</span>
+<span id="L108" class="LineNr">108 </span><span class="Delimiter">:(before &quot;struct trace_stream&quot;)</span>  <span class="Comment">// include constants in all cleaved compilation units</span>
+<span id="L109" class="LineNr">109 </span><span class="Normal">const</span> <span class="Normal">int</span> <span class="Special"><a href='003trace.cc.html#L109'>Max_depth</a></span> = <span class="Constant">9999</span><span class="Delimiter">;</span>
+<span id="L110" class="LineNr">110 </span><span class="Delimiter">:(before &quot;End trace_stream Constructor&quot;)</span>
+<span id="L111" class="LineNr">111 </span>curr_stream = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L112" class="LineNr">112 </span><a href='003trace.cc.html#L102'>curr_depth</a> = <span class="Special"><a href='003trace.cc.html#L109'>Max_depth</a></span><span class="Delimiter">;</span>
+<span id="L113" class="LineNr">113 </span><a href='003trace.cc.html#L104'>collect_depth</a> = <span class="Special"><a href='003trace.cc.html#L109'>Max_depth</a></span><span class="Delimiter">;</span>
+<span id="L114" class="LineNr">114 </span>
+<span id="L115" class="LineNr">115 </span><span class="Delimiter">:(before &quot;struct trace_stream&quot;)</span>
+<span id="L116" class="LineNr">116 </span><span class="Normal">struct</span> trace_line <span class="Delimiter">{</span>
+<span id="L117" class="LineNr">117 </span>  string <a href='003trace.cc.html#L117'>contents</a><span class="Delimiter">;</span>
+<span id="L118" class="LineNr">118 </span>  string label<span class="Delimiter">;</span>
+<span id="L119" class="LineNr">119 </span>  <span class="Normal">int</span> <a href='003trace.cc.html#L119'>depth</a><span class="Delimiter">;</span>  <span class="Comment">// 0 is 'sea level'; positive integers are progressively 'deeper' and lower level</span>
+<span id="L120" class="LineNr">120 </span>  trace_line<span class="Delimiter">(</span>string c<span class="Delimiter">,</span> string l<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L121" class="LineNr">121 </span>    <a href='003trace.cc.html#L117'>contents</a> = c<span class="Delimiter">;</span>
+<span id="L122" class="LineNr">122 </span>    label = l<span class="Delimiter">;</span>
+<span id="L123" class="LineNr">123 </span>    <a href='003trace.cc.html#L119'>depth</a> = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L124" class="LineNr">124 </span>  <span class="Delimiter">}</span>
+<span id="L125" class="LineNr">125 </span>  trace_line<span class="Delimiter">(</span>string c<span class="Delimiter">,</span> string l<span class="Delimiter">,</span> <span class="Normal">int</span> d<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L126" class="LineNr">126 </span>    <a href='003trace.cc.html#L117'>contents</a> = c<span class="Delimiter">;</span>
+<span id="L127" class="LineNr">127 </span>    label = l<span class="Delimiter">;</span>
+<span id="L128" class="LineNr">128 </span>    <a href='003trace.cc.html#L119'>depth</a> = d<span class="Delimiter">;</span>
+<span id="L129" class="LineNr">129 </span>  <span class="Delimiter">}</span>
+<span id="L130" class="LineNr">130 </span><span class="Delimiter">};</span>
+<span id="L131" class="LineNr">131 </span>
+<span id="L132" class="LineNr">132 </span><span class="Comment">//: Starting a new trace line.</span>
+<span id="L133" class="LineNr">133 </span><span class="Delimiter">:(before &quot;End trace_stream Methods&quot;)</span>
+<span id="L134" class="LineNr">134 </span>ostream&amp; stream<span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L135" class="LineNr">135 </span>  <span class="Identifier">return</span> stream<span class="Delimiter">(</span><span class="Special"><a href='003trace.cc.html#L109'>Max_depth</a></span><span class="Delimiter">,</span> label<span class="Delimiter">);</span>
+<span id="L136" class="LineNr">136 </span><span class="Delimiter">}</span>
+<span id="L137" class="LineNr">137 </span>
+<span id="L138" class="LineNr">138 </span>ostream&amp; stream<span class="Delimiter">(</span><span class="Normal">int</span> <a href='003trace.cc.html#L119'>depth</a><span class="Delimiter">,</span> string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L139" class="LineNr">139 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L119'>depth</a> &gt; <a href='003trace.cc.html#L104'>collect_depth</a><span class="Delimiter">)</span> <span class="Identifier">return</span> <a href='003trace.cc.html#L105'>null_stream</a><span class="Delimiter">;</span>
+<span id="L140" class="LineNr">140 </span>  curr_stream = <span class="Normal">new</span> ostringstream<span class="Delimiter">;</span>
+<span id="L141" class="LineNr">141 </span>  <a href='003trace.cc.html#L101'>curr_label</a> = label<span class="Delimiter">;</span>
+<span id="L142" class="LineNr">142 </span>  <a href='003trace.cc.html#L102'>curr_depth</a> = <a href='003trace.cc.html#L119'>depth</a><span class="Delimiter">;</span>
+<span id="L143" class="LineNr">143 </span>  <span class="Delimiter">(</span>*curr_stream<span class="Delimiter">)</span> &lt;&lt; std::hex<span class="Delimiter">;</span>  <span class="Comment">// printing addresses is the common case</span>
+<span id="L144" class="LineNr">144 </span>  <span class="Identifier">return</span> *curr_stream<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><span class="Comment">//: End of a trace line; append it to the trace.</span>
+<span id="L148" class="LineNr">148 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L149" class="LineNr">149 </span><span class="Normal">struct</span> end <span class="Delimiter">{};</span>
+<span id="L150" class="LineNr">150 </span><span class="Delimiter">:(code)</span>
+<span id="L151" class="LineNr">151 </span>ostream&amp; <span class="Normal">operator</span>&lt;&lt;<span class="Delimiter">(</span>ostream&amp; os<span class="Delimiter">,</span> end <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L152" class="LineNr">152 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='003trace.cc.html#L72'>Trace_stream</a></span><span class="Delimiter">)</span> <span class="Special"><a href='003trace.cc.html#L72'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L159'>newline</a><span class="Delimiter">();</span>
+<span id="L153" class="LineNr">153 </span>  <span class="Identifier">return</span> os<span class="Delimiter">;</span>
+<span id="L154" class="LineNr">154 </span><span class="Delimiter">}</span>
+<span id="L155" class="LineNr">155 </span>
+<span id="L156" class="LineNr">156 </span><span class="Delimiter">:(before &quot;End trace_stream Methods&quot;)</span>
+<span id="L157" class="LineNr">157 </span><span class="Normal">void</span> <a href='003trace.cc.html#L159'>newline</a><span class="Delimiter">();</span>
+<span id="L158" class="LineNr">158 </span><span class="Delimiter">:(code)</span>
+<span id="L159" class="LineNr">159 </span><span class="Normal">void</span> trace_stream::<a href='003trace.cc.html#L159'>newline</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L160" class="LineNr">160 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr_stream<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L161" class="LineNr">161 </span>  string curr_contents = curr_stream<span class="Delimiter">-&gt;</span>str<span class="Delimiter">();</span>
+<span id="L162" class="LineNr">162 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr_contents<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L163" class="LineNr">163 </span>    <a href='003trace.cc.html#L76'>past_lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>trace_line<span class="Delimiter">(</span>curr_contents<span class="Delimiter">,</span> <a href='003trace.cc.html#L468'>trim</a><span class="Delimiter">(</span><a href='003trace.cc.html#L101'>curr_label</a><span class="Delimiter">),</span> <a href='003trace.cc.html#L102'>curr_depth</a><span class="Delimiter">));</span>  <span class="Comment">// preserve indent in contents</span>
+<span id="L164" class="LineNr">164 </span>    <span class="Comment">// maybe incrementally dump trace</span>
+<span id="L165" class="LineNr">165 </span>    trace_line&amp; t = <a href='003trace.cc.html#L76'>past_lines</a><span class="Delimiter">.</span>back<span class="Delimiter">();</span>
+<span id="L166" class="LineNr">166 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L219'>should_incrementally_print_trace</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L167" class="LineNr">167 </span>      cerr       &lt;&lt; std::setw<span class="Delimiter">(</span><span class="Constant">4</span><span class="Delimiter">)</span> &lt;&lt; t<span class="Delimiter">.</span><a href='003trace.cc.html#L119'>depth</a> &lt;&lt; <span class="Constant">' '</span> &lt;&lt; t<span class="Delimiter">.</span>label &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; t<span class="Delimiter">.</span><a href='003trace.cc.html#L117'>contents</a> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L168" class="LineNr">168 </span>    <span class="Delimiter">}</span>
+<span id="L169" class="LineNr">169 </span>    <span class="Comment">// End trace Commit</span>
+<span id="L170" class="LineNr">170 </span>  <span class="Delimiter">}</span>
+<span id="L171" class="LineNr">171 </span>
+<span id="L172" class="LineNr">172 </span>  <span class="Comment">// clean up</span>
+<span id="L173" class="LineNr">173 </span>  <span class="Normal">delete</span> curr_stream<span class="Delimiter">;</span>
+<span id="L174" class="LineNr">174 </span>  curr_stream = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L175" class="LineNr">175 </span>  <a href='003trace.cc.html#L101'>curr_label</a><span class="Delimiter">.</span>clear<span class="Delimiter">();</span>
+<span id="L176" class="LineNr">176 </span>  <a href='003trace.cc.html#L102'>curr_depth</a> = <span class="Special"><a href='003trace.cc.html#L109'>Max_depth</a></span><span class="Delimiter">;</span>
+<span id="L177" class="LineNr">177 </span><span class="Delimiter">}</span>
+<span id="L178" class="LineNr">178 </span>
+<span id="L179" class="LineNr">179 </span><span class="SalientComment">//:: == Initializing the trace in tests</span>
+<span id="L180" class="LineNr">180 </span>
+<span id="L181" class="LineNr">181 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L182" class="LineNr">182 </span><span class="PreProc">#define START_TRACING_UNTIL_END_OF_SCOPE  lease_tracer leased_tracer</span><span class="Delimiter">;</span>
+<span id="L183" class="LineNr">183 </span><span class="Delimiter">:(before &quot;End Test Setup&quot;)</span>
+<span id="L184" class="LineNr">184 </span><a href='003trace.cc.html#L182'>START_TRACING_UNTIL_END_OF_SCOPE</a>
+<span id="L185" class="LineNr">185 </span>
+<span id="L186" class="LineNr">186 </span><span class="Comment">//: Trace_stream is a resource, lease_tracer uses RAII to manage it.</span>
+<span id="L187" class="LineNr">187 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L188" class="LineNr">188 </span><span class="Normal">struct</span> lease_tracer <span class="Delimiter">{</span>
+<span id="L189" class="LineNr">189 </span>  lease_tracer<span class="Delimiter">();</span>
+<span id="L190" class="LineNr">190 </span>  <a href='003trace.cc.html#L194'>~lease_tracer</a><span class="Delimiter">();</span>
+<span id="L191" class="LineNr">191 </span><span class="Delimiter">};</span>
+<span id="L192" class="LineNr">192 </span><span class="Delimiter">:(code)</span>
+<span id="L193" class="LineNr">193 </span>lease_tracer::lease_tracer<span class="Delimiter">()</span> <span class="Delimiter">{</span> <span class="Special"><a href='003trace.cc.html#L72'>Trace_stream</a></span> = <span class="Normal">new</span> trace_stream<span class="Delimiter">;</span> <span class="Delimiter">}</span>
+<span id="L194" class="LineNr">194 </span>lease_tracer::<a href='003trace.cc.html#L194'>~lease_tracer</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L195" class="LineNr">195 </span>  <span class="Normal">delete</span> <span class="Special"><a href='003trace.cc.html#L72'>Trace_stream</a></span><span class="Delimiter">;</span>
+<span id="L196" class="LineNr">196 </span>  <span class="Special"><a href='003trace.cc.html#L72'>Trace_stream</a></span> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L197" class="LineNr">197 </span><span class="Delimiter">}</span>
+<span id="L198" class="LineNr">198 </span>
+<span id="L199" class="LineNr">199 </span><span class="SalientComment">//:: == Errors and warnings using traces</span>
 <span id="L200" class="LineNr">200 </span>
-<span id="L201" class="LineNr">201 </span><span class="Comment">//: Trace_stream is a resource, lease_tracer uses RAII to manage it.</span>
-<span id="L202" class="LineNr">202 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L203" class="LineNr">203 </span><span class="Normal">struct</span> lease_tracer <span class="Delimiter">{</span>
-<span id="L204" class="LineNr">204 </span>  lease_tracer<span class="Delimiter">();</span>
-<span id="L205" class="LineNr">205 </span>  <a href='003trace.cc.html#L209'>~lease_tracer</a><span class="Delimiter">();</span>
-<span id="L206" class="LineNr">206 </span><span class="Delimiter">};</span>
-<span id="L207" class="LineNr">207 </span><span class="Delimiter">:(code)</span>
-<span id="L208" class="LineNr">208 </span>lease_tracer::lease_tracer<span class="Delimiter">()</span> <span class="Delimiter">{</span> <span class="Special"><a href='003trace.cc.html#L74'>Trace_stream</a></span> = <span class="Normal">new</span> trace_stream<span class="Delimiter">;</span> <span class="Delimiter">}</span>
-<span id="L209" class="LineNr">209 </span>lease_tracer::<a href='003trace.cc.html#L209'>~lease_tracer</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L210" class="LineNr">210 </span>  <span class="Normal">delete</span> <span class="Special"><a href='003trace.cc.html#L74'>Trace_stream</a></span><span class="Delimiter">;</span>
-<span id="L211" class="LineNr">211 </span>  <span class="Special"><a href='003trace.cc.html#L74'>Trace_stream</a></span> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L212" class="LineNr">212 </span><span class="Delimiter">}</span>
-<span id="L213" class="LineNr">213 </span>
-<span id="L214" class="LineNr">214 </span><span class="SalientComment">//:: == Errors and warnings using traces</span>
-<span id="L215" class="LineNr">215 </span>
-<span id="L216" class="LineNr">216 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L217" class="LineNr">217 </span><span class="Comment">#define raise  (!Trace_stream ? (++Trace_errors,cerr) /*do print*/ : Trace_stream-&gt;stream(Error_depth, &quot;error&quot;))</span>
-<span id="L218" class="LineNr">218 </span><span class="Comment">#define warn (!Trace_stream ? (++Trace_errors,cerr) /*do print*/ : Trace_stream-&gt;stream(Warn_depth, &quot;warn&quot;))</span>
-<span id="L219" class="LineNr">219 </span>
-<span id="L220" class="LineNr">220 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L221" class="LineNr">221 </span><span class="Normal">int</span> <span class="Special"><a href='003trace.cc.html#L221'>Trace_errors</a></span> = <span class="Constant">0</span><span class="Delimiter">;</span>  <span class="Comment">// used only when Trace_stream is NULL</span>
-<span id="L222" class="LineNr">222 </span>
-<span id="L223" class="LineNr">223 </span><span class="Comment">// Fail scenarios that displayed (unexpected) errors.</span>
-<span id="L224" class="LineNr">224 </span><span class="Comment">// Expected errors should always be hidden and silently checked for.</span>
-<span id="L225" class="LineNr">225 </span><span class="Delimiter">:(before &quot;End Test Teardown&quot;)</span>
-<span id="L226" class="LineNr">226 </span><span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> &amp;&amp; !<span class="Special">Hide_errors</span> &amp;&amp; <a href='003trace.cc.html#L230'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L227" class="LineNr">227 </span>  <span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L228" class="LineNr">228 </span><span class="Delimiter">}</span>
-<span id="L229" class="LineNr">229 </span><span class="Delimiter">:(code)</span>
-<span id="L230" class="LineNr">230 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L230'>trace_contains_errors</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L231" class="LineNr">231 </span>  <span class="Identifier">return</span> <span class="Special"><a href='003trace.cc.html#L221'>Trace_errors</a></span> &gt; <span class="Constant">0</span> || trace_count<span class="Delimiter">(</span><span class="Constant">&quot;error&quot;</span><span class="Delimiter">)</span> &gt; <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L232" class="LineNr">232 </span><span class="Delimiter">}</span>
-<span id="L233" class="LineNr">233 </span>
-<span id="L234" class="LineNr">234 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L235" class="LineNr">235 </span><span class="Comment">// If we aren't yet sure how to deal with some corner case, use assert_for_now</span>
-<span id="L236" class="LineNr">236 </span><span class="Comment">// to indicate that it isn't an inviolable invariant.</span>
-<span id="L237" class="LineNr">237 </span><span class="Comment">#define assert_for_now assert</span>
-<span id="L238" class="LineNr">238 </span><span class="Comment">#define raise_for_now raise</span>
-<span id="L239" class="LineNr">239 </span>
-<span id="L240" class="LineNr">240 </span><span class="SalientComment">//:: == Other assertions on traces</span>
-<span id="L241" class="LineNr">241 </span><span class="Comment">//: Primitives:</span>
-<span id="L242" class="LineNr">242 </span><span class="Comment">//:   - CHECK_TRACE_CONTENTS(lines)</span>
-<span id="L243" class="LineNr">243 </span><span class="Comment">//:     Assert that the trace contains the given lines (separated by newlines)</span>
-<span id="L244" class="LineNr">244 </span><span class="Comment">//:     in order. There can be other intervening lines between them.</span>
-<span id="L245" class="LineNr">245 </span><span class="Comment">//:   - CHECK_TRACE_DOESNT_CONTAIN(line)</span>
-<span id="L246" class="LineNr">246 </span><span class="Comment">//:   - CHECK_TRACE_DOESNT_CONTAIN(label, contents)</span>
-<span id="L247" class="LineNr">247 </span><span class="Comment">//:     Assert that the trace doesn't contain the given (single) line.</span>
-<span id="L248" class="LineNr">248 </span><span class="Comment">//:   - CHECK_TRACE_COUNT(label, count)</span>
-<span id="L249" class="LineNr">249 </span><span class="Comment">//:     Assert that the trace contains exactly 'count' lines with the given</span>
-<span id="L250" class="LineNr">250 </span><span class="Comment">//:     'label'.</span>
-<span id="L251" class="LineNr">251 </span><span class="Comment">//:   - CHECK_TRACE_CONTAINS_ERRORS()</span>
-<span id="L252" class="LineNr">252 </span><span class="Comment">//:   - CHECK_TRACE_DOESNT_CONTAIN_ERRORS()</span>
-<span id="L253" class="LineNr">253 </span><span class="Comment">//:   - trace_count_prefix(label, prefix)</span>
-<span id="L254" class="LineNr">254 </span><span class="Comment">//:     Count the number of trace lines with the given 'label' that start with</span>
-<span id="L255" class="LineNr">255 </span><span class="Comment">//:     the given 'prefix'.</span>
-<span id="L256" class="LineNr">256 </span>
-<span id="L257" class="LineNr">257 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L258" class="LineNr">258 </span><span class="Comment">#define CHECK_TRACE_CONTENTS(...)  check_trace_contents(__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)</span>
-<span id="L259" class="LineNr">259 </span>
-<span id="L260" class="LineNr">260 </span><span class="Comment">#define CHECK_TRACE_DOESNT_CONTAIN(...)  CHECK(trace_doesnt_contain(__VA_ARGS__))</span>
-<span id="L261" class="LineNr">261 </span>
-<span id="L262" class="LineNr">262 </span><span class="Comment">#define CHECK_TRACE_COUNT(label, count) \</span>
-<span id="L263" class="LineNr">263 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> &amp;&amp; trace_count<span class="Delimiter">(</span>label<span class="Delimiter">)</span> != <span class="Delimiter">(</span>count<span class="Delimiter">))</span> <span class="Delimiter">{</span> \
-<span id="L264" class="LineNr">264 </span>    cerr &lt;&lt; <span class="Constant">&quot;\nF - &quot;</span> &lt;&lt; __FUNCTION__ &lt;&lt; <span class="Constant">&quot;(&quot;</span> &lt;&lt; <span class="Constant">__FILE__</span> &lt;&lt; <span class="Constant">&quot;:&quot;</span> &lt;&lt; <span class="Constant">__LINE__</span> &lt;&lt; <span class="Constant">&quot;): trace_count of &quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot; should be &quot;</span> &lt;&lt; count &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> \
-<span id="L265" class="LineNr">265 </span>    cerr &lt;&lt; <span class="Constant">&quot;  got &quot;</span> &lt;&lt; trace_count<span class="Delimiter">(</span>label<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>  <span class="Comment">/*</span><span class="Comment"> multiple eval </span><span class="Comment">*/</span> \
-<span id="L266" class="LineNr">266 </span>    <a href='003trace.cc.html#L402'>DUMP</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span> \
-<span id="L267" class="LineNr">267 </span>    <span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> =<span class="Constant"> false</span><span class="Delimiter">;</span> \
-<span id="L268" class="LineNr">268 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">/*</span><span class="Comment"> Currently we stop at the very first failure. </span><span class="Comment">*/</span> \
-<span id="L269" class="LineNr">269 </span>  <span class="Delimiter">}</span>
-<span id="L270" class="LineNr">270 </span>
-<span id="L271" class="LineNr">271 </span><span class="Comment">#define CHECK_TRACE_CONTAINS_ERRORS()  CHECK(trace_contains_errors())</span>
-<span id="L272" class="LineNr">272 </span><span class="Comment">#define CHECK_TRACE_DOESNT_CONTAIN_ERRORS() \</span>
-<span id="L273" class="LineNr">273 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> &amp;&amp; <a href='003trace.cc.html#L230'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span> \
-<span id="L274" class="LineNr">274 </span>    cerr &lt;&lt; <span class="Constant">&quot;\nF - &quot;</span> &lt;&lt; __FUNCTION__ &lt;&lt; <span class="Constant">&quot;(&quot;</span> &lt;&lt; <span class="Constant">__FILE__</span> &lt;&lt; <span class="Constant">&quot;:&quot;</span> &lt;&lt; <span class="Constant">__LINE__</span> &lt;&lt; <span class="Constant">&quot;): unexpected errors\n&quot;</span><span class="Delimiter">;</span> \
-<span id="L275" class="LineNr">275 </span>    <a href='003trace.cc.html#L402'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;error&quot;</span><span class="Delimiter">);</span> \
-<span id="L276" class="LineNr">276 </span>    <span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> =<span class="Constant"> false</span><span class="Delimiter">;</span> \
-<span id="L277" class="LineNr">277 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span> \
-<span id="L278" class="LineNr">278 </span>  <span class="Delimiter">}</span>
-<span id="L279" class="LineNr">279 </span>
-<span id="L280" class="LineNr">280 </span><span class="Comment">// Allow scenarios to ignore trace lines generated during setup.</span>
-<span id="L281" class="LineNr">281 </span><span class="Comment">#define CLEAR_TRACE  delete Trace_stream, Trace_stream = new trace_stream</span>
-<span id="L282" class="LineNr">282 </span>
-<span id="L283" class="LineNr">283 </span><span class="Delimiter">:(code)</span>
-<span id="L284" class="LineNr">284 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L284'>check_trace_contents</a><span class="Delimiter">(</span>string FUNCTION<span class="Delimiter">,</span> string <span class="Normal">FILE</span><span class="Delimiter">,</span> <span class="Normal">int</span> LINE<span class="Delimiter">,</span> string expected<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L285" class="LineNr">285 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!<span class="Special"><a href='002test.cc.html#L21'>Passed</a></span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L286" class="LineNr">286 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!<span class="Special"><a href='003trace.cc.html#L74'>Trace_stream</a></span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L287" class="LineNr">287 </span>  vector&lt;string&gt; expected_lines = <a href='003trace.cc.html#L374'>split</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;^D&quot;</span><span class="Delimiter">);</span>
-<span id="L288" class="LineNr">288 </span>  <span class="Normal">int</span> curr_expected_line = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L289" class="LineNr">289 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">)</span> &amp;&amp; expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>empty<span class="Delimiter">())</span>
-<span id="L290" class="LineNr">290 </span>    ++curr_expected_line<span class="Delimiter">;</span>
-<span id="L291" class="LineNr">291 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L292" class="LineNr">292 </span>  string label<span class="Delimiter">,</span> <a href='003trace.cc.html#L131'>contents</a><span class="Delimiter">;</span>
-<span id="L293" class="LineNr">293 </span>  <a href='003trace.cc.html#L353'>split_label_contents</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">),</span> &amp;label<span class="Delimiter">,</span> &amp;contents<span class="Delimiter">);</span>
-<span id="L294" class="LineNr">294 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <span class="Special"><a href='003trace.cc.html#L74'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L78'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special"><a href='003trace.cc.html#L74'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L78'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L295" class="LineNr">295 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>label != p<span class="Delimiter">-&gt;</span>label<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L296" class="LineNr">296 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L131'>contents</a> != <a href='003trace.cc.html#L445'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L131'>contents</a><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L297" class="LineNr">297 </span>    ++curr_expected_line<span class="Delimiter">;</span>
-<span id="L298" class="LineNr">298 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">)</span> &amp;&amp; expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>empty<span class="Delimiter">())</span>
-<span id="L299" class="LineNr">299 </span>      ++curr_expected_line<span class="Delimiter">;</span>
-<span id="L300" class="LineNr">300 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L301" class="LineNr">301 </span>    <a href='003trace.cc.html#L353'>split_label_contents</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">),</span> &amp;label<span class="Delimiter">,</span> &amp;contents<span class="Delimiter">);</span>
-<span id="L302" class="LineNr">302 </span>  <span class="Delimiter">}</span>
-<span id="L303" class="LineNr">303 </span>
-<span id="L304" class="LineNr">304 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L366'>line_exists_anywhere</a><span class="Delimiter">(</span>label<span class="Delimiter">,</span> <a href='003trace.cc.html#L131'>contents</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L305" class="LineNr">305 </span>    cerr &lt;&lt; <span class="Constant">&quot;\nF - &quot;</span> &lt;&lt; FUNCTION &lt;&lt; <span class="Constant">&quot;(&quot;</span> &lt;&lt; <span class="Normal">FILE</span> &lt;&lt; <span class="Constant">&quot;:&quot;</span> &lt;&lt; LINE &lt;&lt; <span class="Constant">&quot;): <a href='011run.cc.html#L113'>line</a> [&quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; <a href='003trace.cc.html#L131'>contents</a> &lt;&lt; <span class="Constant">&quot;] out of order in <a href='003trace.cc.html#L98'>trace</a>:\n&quot;</span><span class="Delimiter">;</span>
-<span id="L306" class="LineNr">306 </span>    <a href='003trace.cc.html#L402'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L307" class="LineNr">307 </span>  <span class="Delimiter">}</span>
-<span id="L308" class="LineNr">308 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L309" class="LineNr">309 </span>    cerr &lt;&lt; <span class="Constant">&quot;\nF - &quot;</span> &lt;&lt; FUNCTION &lt;&lt; <span class="Constant">&quot;(&quot;</span> &lt;&lt; <span class="Normal">FILE</span> &lt;&lt; <span class="Constant">&quot;:&quot;</span> &lt;&lt; LINE &lt;&lt; <span class="Constant">&quot;): missing [&quot;</span> &lt;&lt; <a href='003trace.cc.html#L131'>contents</a> &lt;&lt; <span class="Constant">&quot;] in <a href='003trace.cc.html#L98'>trace</a>:\n&quot;</span><span class="Delimiter">;</span>
-<span id="L310" class="LineNr">310 </span>    <a href='003trace.cc.html#L402'>DUMP</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
-<span id="L311" class="LineNr">311 </span>  <span class="Delimiter">}</span>
-<span id="L312" class="LineNr">312 </span>  <span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L313" class="LineNr">313 </span>  <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L314" class="LineNr">314 </span><span class="Delimiter">}</span>
-<span id="L315" class="LineNr">315 </span>
-<span id="L316" class="LineNr">316 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L316'>trace_doesnt_contain</a><span class="Delimiter">(</span>string expected<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L317" class="LineNr">317 </span>  vector&lt;string&gt; tmp = <a href='003trace.cc.html#L389'>split_first</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;: &quot;</span><span class="Delimiter">);</span>
-<span id="L318" class="LineNr">318 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>tmp<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L319" class="LineNr">319 </span>    <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; expected &lt;&lt; <span class="Constant">&quot;: missing label or <a href='003trace.cc.html#L131'>contents</a> in <a href='003trace.cc.html#L98'>trace</a> line\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L320" class="LineNr">320 </span>    assert<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">);</span>
-<span id="L321" class="LineNr">321 </span>  <span class="Delimiter">}</span>
-<span id="L322" class="LineNr">322 </span>  <span class="Identifier">return</span> trace_count<span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> tmp<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">))</span> == <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L323" class="LineNr">323 </span><span class="Delimiter">}</span>
-<span id="L324" class="LineNr">324 </span>
-<span id="L325" class="LineNr">325 </span><span class="Normal">int</span> trace_count<span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L326" class="LineNr">326 </span>  <span class="Identifier">return</span> trace_count<span class="Delimiter">(</span>label<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L327" class="LineNr">327 </span><span class="Delimiter">}</span>
-<span id="L328" class="LineNr">328 </span>
-<span id="L329" class="LineNr">329 </span><span class="Normal">int</span> trace_count<span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string <a href='011run.cc.html#L113'>line</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L330" class="LineNr">330 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!<span class="Special"><a href='003trace.cc.html#L74'>Trace_stream</a></span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L331" class="LineNr">331 </span>  <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L332" class="LineNr">332 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <span class="Special"><a href='003trace.cc.html#L74'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L78'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special"><a href='003trace.cc.html#L74'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L78'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L333" class="LineNr">333 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>label == p<span class="Delimiter">-&gt;</span>label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L334" class="LineNr">334 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='011run.cc.html#L113'>line</a> == <span class="Constant">&quot;&quot;</span> || <a href='003trace.cc.html#L445'>trim</a><span class="Delimiter">(</span><a href='011run.cc.html#L113'>line</a><span class="Delimiter">)</span> == <a href='003trace.cc.html#L445'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L131'>contents</a><span class="Delimiter">))</span>
-<span id="L335" class="LineNr">335 </span>        ++result<span class="Delimiter">;</span>
-<span id="L336" class="LineNr">336 </span>    <span class="Delimiter">}</span>
-<span id="L337" class="LineNr">337 </span>  <span class="Delimiter">}</span>
-<span id="L338" class="LineNr">338 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L339" class="LineNr">339 </span><span class="Delimiter">}</span>
-<span id="L340" class="LineNr">340 </span>
-<span id="L341" class="LineNr">341 </span><span class="Normal">int</span> <a href='003trace.cc.html#L341'>trace_count_prefix</a><span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string prefix<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L342" class="LineNr">342 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!<span class="Special"><a href='003trace.cc.html#L74'>Trace_stream</a></span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L343" class="LineNr">343 </span>  <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L344" class="LineNr">344 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <span class="Special"><a href='003trace.cc.html#L74'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L78'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special"><a href='003trace.cc.html#L74'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L78'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L345" class="LineNr">345 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>label == p<span class="Delimiter">-&gt;</span>label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L346" class="LineNr">346 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L102'>starts_with</a><span class="Delimiter">(</span><a href='003trace.cc.html#L445'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L131'>contents</a><span class="Delimiter">),</span> <a href='003trace.cc.html#L445'>trim</a><span class="Delimiter">(</span>prefix<span class="Delimiter">)))</span>
-<span id="L347" class="LineNr">347 </span>        ++result<span class="Delimiter">;</span>
-<span id="L348" class="LineNr">348 </span>    <span class="Delimiter">}</span>
-<span id="L349" class="LineNr">349 </span>  <span class="Delimiter">}</span>
-<span id="L350" class="LineNr">350 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L351" class="LineNr">351 </span><span class="Delimiter">}</span>
-<span id="L352" class="LineNr">352 </span>
-<span id="L353" class="LineNr">353 </span><span class="Normal">void</span> <a href='003trace.cc.html#L353'>split_label_contents</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">,</span> string* label<span class="Delimiter">,</span> string* <a href='003trace.cc.html#L131'>contents</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L354" class="LineNr">354 </span>  <span class="Normal">static</span> <span class="Normal">const</span> string delim<span class="Delimiter">(</span><span class="Constant">&quot;: &quot;</span><span class="Delimiter">);</span>
-<span id="L355" class="LineNr">355 </span>  <span class="Normal">size_t</span> pos = s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
-<span id="L356" class="LineNr">356 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>pos == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L357" class="LineNr">357 </span>    *label = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L358" class="LineNr">358 </span>    *contents = <a href='003trace.cc.html#L445'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">);</span>
-<span id="L359" class="LineNr">359 </span>  <span class="Delimiter">}</span>
-<span id="L360" class="LineNr">360 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L361" class="LineNr">361 </span>    *label = <a href='003trace.cc.html#L445'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> pos<span class="Delimiter">));</span>
-<span id="L362" class="LineNr">362 </span>    *contents = <a href='003trace.cc.html#L445'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span>pos+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">)));</span>
-<span id="L363" class="LineNr">363 </span>  <span class="Delimiter">}</span>
-<span id="L364" class="LineNr">364 </span><span class="Delimiter">}</span>
-<span id="L365" class="LineNr">365 </span>
-<span id="L366" class="LineNr">366 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L366'>line_exists_anywhere</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; label<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; <a href='003trace.cc.html#L131'>contents</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L367" class="LineNr">367 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <span class="Special"><a href='003trace.cc.html#L74'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L78'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special"><a href='003trace.cc.html#L74'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L78'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L368" class="LineNr">368 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>label != p<span class="Delimiter">-&gt;</span>label<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L369" class="LineNr">369 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L131'>contents</a> == <a href='003trace.cc.html#L445'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L131'>contents</a><span class="Delimiter">))</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 class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L201" class="LineNr">201 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L202" class="LineNr">202 </span><span class="PreProc">#define raise  (!</span><span class="Special">Trace_stream</span><span class="PreProc"> ? (++</span><span class="Special">Trace_errors</span><span class="Delimiter">,</span><span class="PreProc">cerr) </span><span class="Comment">/*</span><span class="Comment">do print</span><span class="Comment">*/</span><span class="PreProc"> : </span><span class="Special">Trace_stream</span><span class="Delimiter">-&gt;</span><span class="PreProc">stream(</span><span class="Special">Error_depth</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">&quot;error&quot;</span><span class="PreProc">))</span>
+<span id="L203" class="LineNr">203 </span><span class="PreProc">#define warn (!</span><span class="Special">Trace_stream</span><span class="PreProc"> ? (++</span><span class="Special">Trace_errors</span><span class="Delimiter">,</span><span class="PreProc">cerr) </span><span class="Comment">/*</span><span class="Comment">do print</span><span class="Comment">*/</span><span class="PreProc"> : </span><span class="Special">Trace_stream</span><span class="Delimiter">-&gt;</span><span class="PreProc">stream(</span><span class="Special">Warn_depth</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">&quot;warn&quot;</span><span class="PreProc">))</span>
+<span id="L204" class="LineNr">204 </span>
+<span id="L205" class="LineNr">205 </span><span class="Comment">//: Print errors and warnings to the screen by default.</span>
+<span id="L206" class="LineNr">206 </span><span class="Delimiter">:(before &quot;struct trace_stream&quot;)</span>  <span class="Comment">// include constants in all cleaved compilation units</span>
+<span id="L207" class="LineNr">207 </span><span class="Normal">const</span> <span class="Normal">int</span> <span class="Special"><a href='003trace.cc.html#L207'>Error_depth</a></span> = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L208" class="LineNr">208 </span><span class="Normal">const</span> <span class="Normal">int</span> <span class="Special"><a href='003trace.cc.html#L208'>Warn_depth</a></span> = <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L209" class="LineNr">209 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L210" class="LineNr">210 </span><span class="Normal">int</span> <span class="Special">Hide_errors</span> = <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// if set, don't print errors or warnings to screen</span>
+<span id="L211" class="LineNr">211 </span><span class="Normal">int</span> <span class="Special">Hide_warnings</span> = <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// if set, don't print warnings to screen</span>
+<span id="L212" class="LineNr">212 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
+<span id="L213" class="LineNr">213 </span><span class="Special">Hide_errors</span> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L214" class="LineNr">214 </span><span class="Special">Hide_warnings</span> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L215" class="LineNr">215 </span><span class="Comment">//: Never dump warnings in tests</span>
+<span id="L216" class="LineNr">216 </span><span class="Delimiter">:(before &quot;End Test Setup&quot;)</span>
+<span id="L217" class="LineNr">217 </span><span class="Special">Hide_warnings</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L218" class="LineNr">218 </span><span class="Delimiter">:(code)</span>
+<span id="L219" class="LineNr">219 </span><span class="Normal">bool</span> trace_stream::<a href='003trace.cc.html#L219'>should_incrementally_print_trace</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L220" class="LineNr">220 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!<span class="Special">Hide_errors</span> &amp;&amp; <a href='003trace.cc.html#L102'>curr_depth</a> == <span class="Special"><a href='003trace.cc.html#L207'>Error_depth</a></span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L221" class="LineNr">221 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!<span class="Special">Hide_warnings</span> &amp;&amp; !<span class="Special">Hide_errors</span> &amp;&amp; <a href='003trace.cc.html#L102'>curr_depth</a> == <span class="Special"><a href='003trace.cc.html#L208'>Warn_depth</a></span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L222" class="LineNr">222 </span>  <span class="Comment">// End Incremental Trace Print Conditions</span>
+<span id="L223" class="LineNr">223 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L224" class="LineNr">224 </span><span class="Delimiter">}</span>
+<span id="L225" class="LineNr">225 </span><span class="Delimiter">:(before &quot;End trace_stream Methods&quot;)</span>
+<span id="L226" class="LineNr">226 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L219'>should_incrementally_print_trace</a><span class="Delimiter">();</span>
+<span id="L227" class="LineNr">227 </span>
+<span id="L228" class="LineNr">228 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L229" class="LineNr">229 </span><span class="Normal">int</span> <span class="Special"><a href='003trace.cc.html#L229'>Trace_errors</a></span> = <span class="Constant">0</span><span class="Delimiter">;</span>  <span class="Comment">// used only when Trace_stream is NULL</span>
+<span id="L230" class="LineNr">230 </span>
+<span id="L231" class="LineNr">231 </span><span class="Comment">// Fail tests that displayed (unexpected) errors.</span>
+<span id="L232" class="LineNr">232 </span><span class="Comment">// Expected errors should always be hidden and silently checked for.</span>
+<span id="L233" class="LineNr">233 </span><span class="Delimiter">:(before &quot;End Test Teardown&quot;)</span>
+<span id="L234" class="LineNr">234 </span><span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> &amp;&amp; !<span class="Special">Hide_errors</span> &amp;&amp; <a href='003trace.cc.html#L238'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L235" class="LineNr">235 </span>  <span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> = <span class="Constant">false</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="Delimiter">:(code)</span>
+<span id="L238" class="LineNr">238 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L238'>trace_contains_errors</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L239" class="LineNr">239 </span>  <span class="Identifier">return</span> <span class="Special"><a href='003trace.cc.html#L229'>Trace_errors</a></span> &gt; <span class="Constant">0</span> || trace_count<span class="Delimiter">(</span><span class="Constant">&quot;error&quot;</span><span class="Delimiter">)</span> &gt; <span class="Constant">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 id="L242" class="LineNr">242 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L243" class="LineNr">243 </span><span class="Comment">// If we aren't yet sure how to deal with some corner case, use assert_for_now</span>
+<span id="L244" class="LineNr">244 </span><span class="Comment">// to indicate that it isn't an inviolable invariant.</span>
+<span id="L245" class="LineNr">245 </span><span class="PreProc">#define assert_for_now assert</span>
+<span id="L246" class="LineNr">246 </span><span class="PreProc">#define raise_for_now raise</span>
+<span id="L247" class="LineNr">247 </span>
+<span id="L248" class="LineNr">248 </span><span class="SalientComment">//:: == Other assertions on traces</span>
+<span id="L249" class="LineNr">249 </span><span class="Comment">//: Primitives:</span>
+<span id="L250" class="LineNr">250 </span><span class="Comment">//:   - CHECK_TRACE_CONTENTS(lines)</span>
+<span id="L251" class="LineNr">251 </span><span class="Comment">//:     Assert that the trace contains the given lines (separated by newlines)</span>
+<span id="L252" class="LineNr">252 </span><span class="Comment">//:     in order. There can be other intervening lines between them.</span>
+<span id="L253" class="LineNr">253 </span><span class="Comment">//:   - CHECK_TRACE_DOESNT_CONTAIN(line)</span>
+<span id="L254" class="LineNr">254 </span><span class="Comment">//:   - CHECK_TRACE_DOESNT_CONTAIN(label, contents)</span>
+<span id="L255" class="LineNr">255 </span><span class="Comment">//:     Assert that the trace doesn't contain the given (single) line.</span>
+<span id="L256" class="LineNr">256 </span><span class="Comment">//:   - CHECK_TRACE_COUNT(label, count)</span>
+<span id="L257" class="LineNr">257 </span><span class="Comment">//:     Assert that the trace contains exactly 'count' lines with the given</span>
+<span id="L258" class="LineNr">258 </span><span class="Comment">//:     'label'.</span>
+<span id="L259" class="LineNr">259 </span><span class="Comment">//:   - CHECK_TRACE_CONTAINS_ERRORS()</span>
+<span id="L260" class="LineNr">260 </span><span class="Comment">//:   - CHECK_TRACE_DOESNT_CONTAIN_ERRORS()</span>
+<span id="L261" class="LineNr">261 </span><span class="Comment">//:   - trace_count_prefix(label, prefix)</span>
+<span id="L262" class="LineNr">262 </span><span class="Comment">//:     Count the number of trace lines with the given 'label' that start with</span>
+<span id="L263" class="LineNr">263 </span><span class="Comment">//:     the given 'prefix'.</span>
+<span id="L264" class="LineNr">264 </span>
+<span id="L265" class="LineNr">265 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L266" class="LineNr">266 </span><span class="PreProc">#define CHECK_TRACE_CONTENTS(</span><span class="Delimiter">...</span><span class="PreProc">)  check_trace_contents(__FUNCTION__</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">__FILE__</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">__LINE__</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">__VA_ARGS__</span><span class="PreProc">)</span>
+<span id="L267" class="LineNr">267 </span>
+<span id="L268" class="LineNr">268 </span><span class="PreProc">#define CHECK_TRACE_DOESNT_CONTAIN(</span><span class="Delimiter">...</span><span class="PreProc">)  CHECK(trace_doesnt_contain(</span><span class="Constant">__VA_ARGS__</span><span class="PreProc">))</span>
+<span id="L269" class="LineNr">269 </span>
+<span id="L270" class="LineNr">270 </span><span class="PreProc">#define CHECK_TRACE_COUNT(label</span><span class="Delimiter">,</span><span class="PreProc"> count) \</span>
+<span id="L271" class="LineNr">271 </span><span class="PreProc">  </span><span class="Normal">if</span><span class="PreProc"> (</span><span class="Special"><a href='002test.cc.html#L21'>Passed</a></span><span class="PreProc"> &amp;&amp; trace_count(label) != (count)) </span><span class="Delimiter">{</span><span class="PreProc"> \</span>
+<span id="L272" class="LineNr">272 </span><span class="PreProc">    cerr &lt;&lt; </span><span class="Constant">&quot;\nF - &quot;</span><span class="PreProc"> &lt;&lt; __FUNCTION__ &lt;&lt; </span><span class="Constant">&quot;(&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__FILE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;:&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__LINE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;): trace_count of &quot;</span><span class="PreProc"> &lt;&lt; label &lt;&lt; </span><span class="Constant">&quot; should be &quot;</span><span class="PreProc"> &lt;&lt; count &lt;&lt; </span><span class="cSpecial">'\n'</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L273" class="LineNr">273 </span><span class="PreProc">    cerr &lt;&lt; </span><span class="Constant">&quot;  got &quot;</span><span class="PreProc"> &lt;&lt; trace_count(label) &lt;&lt; </span><span class="cSpecial">'\n'</span><span class="Delimiter">;</span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> multiple eval </span><span class="Comment">*/</span><span class="PreProc"> \</span>
+<span id="L274" class="LineNr">274 </span><span class="PreProc">    DUMP(label)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L275" class="LineNr">275 </span><span class="PreProc">    </span><span class="Special"><a href='002test.cc.html#L21'>Passed</a></span><span class="PreProc"> = </span><span class="Constant">false</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L276" class="LineNr">276 </span><span class="PreProc">    </span><span class="Identifier">return</span><span class="Delimiter">;</span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> Currently we stop at the very first failure. </span><span class="Comment">*/</span><span class="PreProc"> \</span>
+<span id="L277" class="LineNr">277 </span><span class="PreProc">  </span><span class="Delimiter">}</span>
+<span id="L278" class="LineNr">278 </span>
+<span id="L279" class="LineNr">279 </span><span class="PreProc">#define CHECK_TRACE_CONTAINS_ERRORS()  CHECK(trace_contains_errors())</span>
+<span id="L280" class="LineNr">280 </span><span class="PreProc">#define CHECK_TRACE_DOESNT_CONTAIN_ERRORS() \</span>
+<span id="L281" class="LineNr">281 </span><span class="PreProc">  </span><span class="Normal">if</span><span class="PreProc"> (</span><span class="Special"><a href='002test.cc.html#L21'>Passed</a></span><span class="PreProc"> &amp;&amp; trace_contains_errors()) </span><span class="Delimiter">{</span><span class="PreProc"> \</span>
+<span id="L282" class="LineNr">282 </span><span class="PreProc">    cerr &lt;&lt; </span><span class="Constant">&quot;\nF - &quot;</span><span class="PreProc"> &lt;&lt; __FUNCTION__ &lt;&lt; </span><span class="Constant">&quot;(&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__FILE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;:&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__LINE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;): unexpected errors\n&quot;</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L283" class="LineNr">283 </span><span class="PreProc">    DUMP(</span><span class="Constant">&quot;error&quot;</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L284" class="LineNr">284 </span><span class="PreProc">    </span><span class="Special"><a href='002test.cc.html#L21'>Passed</a></span><span class="PreProc"> = </span><span class="Constant">false</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L285" class="LineNr">285 </span><span class="PreProc">    </span><span class="Identifier">return</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L286" class="LineNr">286 </span><span class="PreProc">  </span><span class="Delimiter">}</span>
+<span id="L287" class="LineNr">287 </span>
+<span id="L288" class="LineNr">288 </span><span class="Comment">// Allow tests to ignore trace lines generated during setup.</span>
+<span id="L289" class="LineNr">289 </span><span class="PreProc">#define CLEAR_TRACE  </span><span class="Normal">delete</span><span class="PreProc"> </span><span class="Special">Trace_stream</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Special">Trace_stream</span><span class="PreProc"> = </span><span class="Normal">new</span><span class="PreProc"> trace_stream</span>
+<span id="L290" class="LineNr">290 </span>
+<span id="L291" class="LineNr">291 </span><span class="Delimiter">:(code)</span>
+<span id="L292" class="LineNr">292 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L292'>check_trace_contents</a><span class="Delimiter">(</span>string FUNCTION<span class="Delimiter">,</span> string <span class="Normal">FILE</span><span class="Delimiter">,</span> <span class="Normal">int</span> LINE<span class="Delimiter">,</span> string expected<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L293" class="LineNr">293 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!<span class="Special"><a href='002test.cc.html#L21'>Passed</a></span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L294" class="LineNr">294 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!<span class="Special"><a href='003trace.cc.html#L72'>Trace_stream</a></span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L295" class="LineNr">295 </span>  vector&lt;string&gt; expected_lines = <a href='003trace.cc.html#L382'>split</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;\n&quot;</span><span class="Delimiter">);</span>
+<span id="L296" class="LineNr">296 </span>  <span class="Normal">int</span> curr_expected_line = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L297" class="LineNr">297 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">)</span> &amp;&amp; expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>empty<span class="Delimiter">())</span>
+<span id="L298" class="LineNr">298 </span>    ++curr_expected_line<span class="Delimiter">;</span>
+<span id="L299" class="LineNr">299 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L300" class="LineNr">300 </span>  string label<span class="Delimiter">,</span> <a href='003trace.cc.html#L117'>contents</a><span class="Delimiter">;</span>
+<span id="L301" class="LineNr">301 </span>  <a href='003trace.cc.html#L361'>split_label_contents</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">),</span> &amp;label<span class="Delimiter">,</span> &amp;contents<span class="Delimiter">);</span>
+<span id="L302" class="LineNr">302 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <span class="Special"><a href='003trace.cc.html#L72'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L76'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special"><a href='003trace.cc.html#L72'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L76'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L303" class="LineNr">303 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>label != p<span class="Delimiter">-&gt;</span>label<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L304" class="LineNr">304 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L117'>contents</a> != <a href='003trace.cc.html#L468'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L117'>contents</a><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L305" class="LineNr">305 </span>    ++curr_expected_line<span class="Delimiter">;</span>
+<span id="L306" class="LineNr">306 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">)</span> &amp;&amp; expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>empty<span class="Delimiter">())</span>
+<span id="L307" class="LineNr">307 </span>      ++curr_expected_line<span class="Delimiter">;</span>
+<span id="L308" class="LineNr">308 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L309" class="LineNr">309 </span>    <a href='003trace.cc.html#L361'>split_label_contents</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">),</span> &amp;label<span class="Delimiter">,</span> &amp;contents<span class="Delimiter">);</span>
+<span id="L310" class="LineNr">310 </span>  <span class="Delimiter">}</span>
+<span id="L311" class="LineNr">311 </span>
+<span id="L312" class="LineNr">312 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L374'>line_exists_anywhere</a><span class="Delimiter">(</span>label<span class="Delimiter">,</span> <a href='003trace.cc.html#L117'>contents</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L313" class="LineNr">313 </span>    cerr &lt;&lt; <span class="Constant">&quot;\nF - &quot;</span> &lt;&lt; FUNCTION &lt;&lt; <span class="Constant">&quot;(&quot;</span> &lt;&lt; <span class="Normal">FILE</span> &lt;&lt; <span class="Constant">&quot;:&quot;</span> &lt;&lt; LINE &lt;&lt; <span class="Constant">&quot;): <a href='011run.cc.html#L120'>line</a> [&quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; <a href='003trace.cc.html#L117'>contents</a> &lt;&lt; <span class="Constant">&quot;] out of order in <a href='003trace.cc.html#L96'>trace</a>:\n&quot;</span><span class="Delimiter">;</span>
+<span id="L314" class="LineNr">314 </span>    <a href='003trace.cc.html#L410'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L315" class="LineNr">315 </span>  <span class="Delimiter">}</span>
+<span id="L316" class="LineNr">316 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L317" class="LineNr">317 </span>    cerr &lt;&lt; <span class="Constant">&quot;\nF - &quot;</span> &lt;&lt; FUNCTION &lt;&lt; <span class="Constant">&quot;(&quot;</span> &lt;&lt; <span class="Normal">FILE</span> &lt;&lt; <span class="Constant">&quot;:&quot;</span> &lt;&lt; LINE &lt;&lt; <span class="Constant">&quot;): missing [&quot;</span> &lt;&lt; <a href='003trace.cc.html#L117'>contents</a> &lt;&lt; <span class="Constant">&quot;] in <a href='003trace.cc.html#L96'>trace</a>:\n&quot;</span><span class="Delimiter">;</span>
+<span id="L318" class="LineNr">318 </span>    <a href='003trace.cc.html#L410'>DUMP</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
+<span id="L319" class="LineNr">319 </span>  <span class="Delimiter">}</span>
+<span id="L320" class="LineNr">320 </span>  <span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L321" class="LineNr">321 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><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="Normal">bool</span> <a href='003trace.cc.html#L324'>trace_doesnt_contain</a><span class="Delimiter">(</span>string expected<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L325" class="LineNr">325 </span>  vector&lt;string&gt; tmp = <a href='003trace.cc.html#L397'>split_first</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;: &quot;</span><span class="Delimiter">);</span>
+<span id="L326" class="LineNr">326 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>tmp<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L327" class="LineNr">327 </span>    <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; expected &lt;&lt; <span class="Constant">&quot;: missing label or <a href='003trace.cc.html#L117'>contents</a> in <a href='003trace.cc.html#L96'>trace</a> line\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L328" class="LineNr">328 </span>    assert<span class="Delimiter">(</span><span class="Constant">false</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="Identifier">return</span> trace_count<span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> tmp<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">))</span> == <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L331" class="LineNr">331 </span><span class="Delimiter">}</span>
+<span id="L332" class="LineNr">332 </span>
+<span id="L333" class="LineNr">333 </span><span class="Normal">int</span> trace_count<span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L334" class="LineNr">334 </span>  <span class="Identifier">return</span> trace_count<span class="Delimiter">(</span>label<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L335" class="LineNr">335 </span><span class="Delimiter">}</span>
+<span id="L336" class="LineNr">336 </span>
+<span id="L337" class="LineNr">337 </span><span class="Normal">int</span> trace_count<span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string <a href='011run.cc.html#L120'>line</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L338" class="LineNr">338 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!<span class="Special"><a href='003trace.cc.html#L72'>Trace_stream</a></span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L339" class="LineNr">339 </span>  <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L340" class="LineNr">340 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <span class="Special"><a href='003trace.cc.html#L72'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L76'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special"><a href='003trace.cc.html#L72'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L76'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L341" class="LineNr">341 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>label == p<span class="Delimiter">-&gt;</span>label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L342" class="LineNr">342 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='011run.cc.html#L120'>line</a> == <span class="Constant">&quot;&quot;</span> || <a href='003trace.cc.html#L468'>trim</a><span class="Delimiter">(</span><a href='011run.cc.html#L120'>line</a><span class="Delimiter">)</span> == <a href='003trace.cc.html#L468'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L117'>contents</a><span class="Delimiter">))</span>
+<span id="L343" class="LineNr">343 </span>        ++result<span class="Delimiter">;</span>
+<span id="L344" class="LineNr">344 </span>    <span class="Delimiter">}</span>
+<span id="L345" class="LineNr">345 </span>  <span class="Delimiter">}</span>
+<span id="L346" class="LineNr">346 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L347" class="LineNr">347 </span><span class="Delimiter">}</span>
+<span id="L348" class="LineNr">348 </span>
+<span id="L349" class="LineNr">349 </span><span class="Normal">int</span> <a href='003trace.cc.html#L349'>trace_count_prefix</a><span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string prefix<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L350" class="LineNr">350 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!<span class="Special"><a href='003trace.cc.html#L72'>Trace_stream</a></span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L351" class="LineNr">351 </span>  <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L352" class="LineNr">352 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <span class="Special"><a href='003trace.cc.html#L72'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L76'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special"><a href='003trace.cc.html#L72'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L76'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L353" class="LineNr">353 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>label == p<span class="Delimiter">-&gt;</span>label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L354" class="LineNr">354 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L102'>starts_with</a><span class="Delimiter">(</span><a href='003trace.cc.html#L468'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L117'>contents</a><span class="Delimiter">),</span> <a href='003trace.cc.html#L468'>trim</a><span class="Delimiter">(</span>prefix<span class="Delimiter">)))</span>
+<span id="L355" class="LineNr">355 </span>        ++result<span class="Delimiter">;</span>
+<span id="L356" class="LineNr">356 </span>    <span class="Delimiter">}</span>
+<span id="L357" class="LineNr">357 </span>  <span class="Delimiter">}</span>
+<span id="L358" class="LineNr">358 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L359" class="LineNr">359 </span><span class="Delimiter">}</span>
+<span id="L360" class="LineNr">360 </span>
+<span id="L361" class="LineNr">361 </span><span class="Normal">void</span> <a href='003trace.cc.html#L361'>split_label_contents</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">,</span> string* label<span class="Delimiter">,</span> string* <a href='003trace.cc.html#L117'>contents</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L362" class="LineNr">362 </span>  <span class="Normal">static</span> <span class="Normal">const</span> string delim<span class="Delimiter">(</span><span class="Constant">&quot;: &quot;</span><span class="Delimiter">);</span>
+<span id="L363" class="LineNr">363 </span>  <span class="Normal">size_t</span> pos = s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
+<span id="L364" class="LineNr">364 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>pos == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L365" class="LineNr">365 </span>    *label = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L366" class="LineNr">366 </span>    *contents = <a href='003trace.cc.html#L468'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">);</span>
+<span id="L367" class="LineNr">367 </span>  <span class="Delimiter">}</span>
+<span id="L368" class="LineNr">368 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L369" class="LineNr">369 </span>    *label = <a href='003trace.cc.html#L468'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> pos<span class="Delimiter">));</span>
+<span id="L370" class="LineNr">370 </span>    *contents = <a href='003trace.cc.html#L468'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span>pos+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">)));</span>
+<span id="L371" class="LineNr">371 </span>  <span class="Delimiter">}</span>
 <span id="L372" class="LineNr">372 </span><span class="Delimiter">}</span>
 <span id="L373" class="LineNr">373 </span>
-<span id="L374" class="LineNr">374 </span>vector&lt;string&gt; <a href='003trace.cc.html#L374'>split</a><span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L375" class="LineNr">375 </span>  vector&lt;string&gt; result<span class="Delimiter">;</span>
-<span id="L376" class="LineNr">376 </span>  <span class="Normal">size_t</span> begin=<span class="Constant">0</span><span class="Delimiter">,</span> end=s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
-<span id="L377" class="LineNr">377 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L378" class="LineNr">378 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>end == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L379" class="LineNr">379 </span>      result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> begin<span class="Delimiter">,</span> string::npos<span class="Delimiter">));</span>
-<span id="L380" class="LineNr">380 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L381" class="LineNr">381 </span>    <span class="Delimiter">}</span>
-<span id="L382" class="LineNr">382 </span>    result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> begin<span class="Delimiter">,</span> end-begin<span class="Delimiter">));</span>
-<span id="L383" class="LineNr">383 </span>    begin = end+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
-<span id="L384" class="LineNr">384 </span>    end = s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">,</span> begin<span class="Delimiter">);</span>
-<span id="L385" class="LineNr">385 </span>  <span class="Delimiter">}</span>
-<span id="L386" class="LineNr">386 </span>  <span class="Identifier">return</span> result<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>vector&lt;string&gt; <a href='003trace.cc.html#L389'>split_first</a><span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L390" class="LineNr">390 </span>  vector&lt;string&gt; result<span class="Delimiter">;</span>
-<span id="L391" class="LineNr">391 </span>  <span class="Normal">size_t</span> end=s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
-<span id="L392" class="LineNr">392 </span>  result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> end<span class="Delimiter">));</span>
-<span id="L393" class="LineNr">393 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>end != string::npos<span class="Delimiter">)</span>
-<span id="L394" class="LineNr">394 </span>    result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> end+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">),</span> string::npos<span class="Delimiter">));</span>
-<span id="L395" class="LineNr">395 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L396" class="LineNr">396 </span><span class="Delimiter">}</span>
-<span id="L397" class="LineNr">397 </span>
-<span id="L398" class="LineNr">398 </span><span class="SalientComment">//:: == Helpers for debugging using traces</span>
-<span id="L399" class="LineNr">399 </span>
-<span id="L400" class="LineNr">400 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L401" class="LineNr">401 </span><span class="Comment">// To debug why a scenario is failing, dump its trace using '?'.</span>
-<span id="L402" class="LineNr">402 </span><span class="Comment">#define DUMP(label)  if (Trace_stream) cerr &lt;&lt; Trace_stream-&gt;readable_contents(label);</span>
-<span id="L403" class="LineNr">403 </span>
-<span id="L404" class="LineNr">404 </span><span class="Comment">// To add temporary prints to the trace, use 'dbg'.</span>
-<span id="L405" class="LineNr">405 </span><span class="Comment">// `git log` should never show any calls to 'dbg'.</span>
-<span id="L406" class="LineNr">406 </span><span class="Comment">#define dbg trace(0, &quot;a&quot;)</span>
+<span id="L374" class="LineNr">374 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L374'>line_exists_anywhere</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; label<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; <a href='003trace.cc.html#L117'>contents</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L375" class="LineNr">375 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <span class="Special"><a href='003trace.cc.html#L72'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L76'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special"><a href='003trace.cc.html#L72'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L76'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L376" class="LineNr">376 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>label != p<span class="Delimiter">-&gt;</span>label<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L377" class="LineNr">377 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L117'>contents</a> == <a href='003trace.cc.html#L468'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L117'>contents</a><span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L378" class="LineNr">378 </span>  <span class="Delimiter">}</span>
+<span id="L379" class="LineNr">379 </span>  <span class="Identifier">return</span> <span class="Constant">false</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>vector&lt;string&gt; <a href='003trace.cc.html#L382'>split</a><span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L383" class="LineNr">383 </span>  vector&lt;string&gt; result<span class="Delimiter">;</span>
+<span id="L384" class="LineNr">384 </span>  <span class="Normal">size_t</span> begin=<span class="Constant">0</span><span class="Delimiter">,</span> end=s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
+<span id="L385" class="LineNr">385 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L386" class="LineNr">386 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>end == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L387" class="LineNr">387 </span>      result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> begin<span class="Delimiter">,</span> string::npos<span class="Delimiter">));</span>
+<span id="L388" class="LineNr">388 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L389" class="LineNr">389 </span>    <span class="Delimiter">}</span>
+<span id="L390" class="LineNr">390 </span>    result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> begin<span class="Delimiter">,</span> end-begin<span class="Delimiter">));</span>
+<span id="L391" class="LineNr">391 </span>    begin = end+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
+<span id="L392" class="LineNr">392 </span>    end = s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">,</span> begin<span class="Delimiter">);</span>
+<span id="L393" class="LineNr">393 </span>  <span class="Delimiter">}</span>
+<span id="L394" class="LineNr">394 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L395" class="LineNr">395 </span><span class="Delimiter">}</span>
+<span id="L396" class="LineNr">396 </span>
+<span id="L397" class="LineNr">397 </span>vector&lt;string&gt; <a href='003trace.cc.html#L397'>split_first</a><span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L398" class="LineNr">398 </span>  vector&lt;string&gt; result<span class="Delimiter">;</span>
+<span id="L399" class="LineNr">399 </span>  <span class="Normal">size_t</span> end=s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
+<span id="L400" class="LineNr">400 </span>  result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> end<span class="Delimiter">));</span>
+<span id="L401" class="LineNr">401 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>end != string::npos<span class="Delimiter">)</span>
+<span id="L402" class="LineNr">402 </span>    result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> end+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">),</span> string::npos<span class="Delimiter">));</span>
+<span id="L403" class="LineNr">403 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L404" class="LineNr">404 </span><span class="Delimiter">}</span>
+<span id="L405" class="LineNr">405 </span>
+<span id="L406" class="LineNr">406 </span><span class="SalientComment">//:: == Helpers for debugging using traces</span>
 <span id="L407" class="LineNr">407 </span>
-<span id="L408" class="LineNr">408 </span><span class="Comment">//: Dump the entire trace to file where it can be browsed offline.</span>
-<span id="L409" class="LineNr">409 </span><span class="Comment">//: Dump the trace as it happens; that way you get something even if the</span>
-<span id="L410" class="LineNr">410 </span><span class="Comment">//: program crashes.</span>
+<span id="L408" class="LineNr">408 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L409" class="LineNr">409 </span><span class="Comment">// To debug why a test is failing, dump its trace using '?'.</span>
+<span id="L410" class="LineNr">410 </span><span class="PreProc">#define DUMP(label)  </span><span class="Normal">if</span><span class="PreProc"> (</span><span class="Special">Trace_stream</span><span class="PreProc">) cerr &lt;&lt; </span><span class="Special">Trace_stream</span><span class="Delimiter">-&gt;</span><span class="PreProc">readable_contents(label)</span><span class="Delimiter">;</span>
 <span id="L411" class="LineNr">411 </span>
-<span id="L412" class="LineNr">412 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L413" class="LineNr">413 </span>ofstream <span class="Special"><a href='003trace.cc.html#L413'>Trace_file</a></span><span class="Delimiter">;</span>
-<span id="L414" class="LineNr">414 </span><span class="Delimiter">:(before &quot;End Commandline Options(*arg)&quot;)</span>
-<span id="L415" class="LineNr">415 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L98'>is_equal</a><span class="Delimiter">(</span>*arg<span class="Delimiter">,</span> <span class="Constant">&quot;--trace&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L416" class="LineNr">416 </span>  cerr &lt;&lt; <span class="Constant">&quot;saving <a href='003trace.cc.html#L98'>trace</a> to 'last_run'\n&quot;</span><span class="Delimiter">;</span>
-<span id="L417" class="LineNr">417 </span>  <span class="Special"><a href='003trace.cc.html#L413'>Trace_file</a></span><span class="Delimiter">.</span>open<span class="Delimiter">(</span><span class="Constant">&quot;last_run&quot;</span><span class="Delimiter">);</span>
-<span id="L418" class="LineNr">418 </span><span class="Delimiter">}</span>
-<span id="L419" class="LineNr">419 </span><span class="Delimiter">:(before &quot;End <a href='003trace.cc.html#L98'>trace</a> Commit&quot;)</span>
-<span id="L420" class="LineNr">420 </span><span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='003trace.cc.html#L413'>Trace_file</a></span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L421" class="LineNr">421 </span>  <span class="Special"><a href='003trace.cc.html#L413'>Trace_file</a></span> &lt;&lt; std::setw<span class="Delimiter">(</span><span class="Constant">4</span><span class="Delimiter">)</span> &lt;&lt; t<span class="Delimiter">.</span><a href='003trace.cc.html#L133'>depth</a> &lt;&lt; <span class="Constant">' '</span> &lt;&lt; t<span class="Delimiter">.</span>label &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; t<span class="Delimiter">.</span><a href='003trace.cc.html#L131'>contents</a> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L422" class="LineNr">422 </span><span class="Delimiter">}</span>
-<span id="L423" class="LineNr">423 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
-<span id="L424" class="LineNr">424 </span>atexit<span class="Delimiter">(</span><a href='003trace.cc.html#L426'>cleanup_main</a><span class="Delimiter">);</span>
-<span id="L425" class="LineNr">425 </span><span class="Delimiter">:(code)</span>
-<span id="L426" class="LineNr">426 </span><span class="Normal">void</span> <a href='003trace.cc.html#L426'>cleanup_main</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L427" class="LineNr">427 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='003trace.cc.html#L413'>Trace_file</a></span><span class="Delimiter">)</span> <span class="Special"><a href='003trace.cc.html#L413'>Trace_file</a></span><span class="Delimiter">.</span>close<span class="Delimiter">();</span>
-<span id="L428" class="LineNr">428 </span>  <span class="Comment">// End cleanup_main</span>
+<span id="L412" class="LineNr">412 </span><span class="Comment">// To add temporary prints to the trace, use 'dbg'.</span>
+<span id="L413" class="LineNr">413 </span><span class="Comment">// `git log` should never show any calls to 'dbg'.</span>
+<span id="L414" class="LineNr">414 </span><span class="PreProc">#define dbg trace(</span><span class="Constant">0</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">&quot;a&quot;</span><span class="PreProc">)</span>
+<span id="L415" class="LineNr">415 </span>
+<span id="L416" class="LineNr">416 </span><span class="Comment">//: Dump the entire trace to file where it can be browsed offline.</span>
+<span id="L417" class="LineNr">417 </span><span class="Comment">//: Dump the trace as it happens; that way you get something even if the</span>
+<span id="L418" class="LineNr">418 </span><span class="Comment">//: program crashes.</span>
+<span id="L419" class="LineNr">419 </span>
+<span id="L420" class="LineNr">420 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L421" class="LineNr">421 </span>ofstream <span class="Special"><a href='003trace.cc.html#L421'>Trace_file</a></span><span class="Delimiter">;</span>
+<span id="L422" class="LineNr">422 </span><span class="Delimiter">:(before &quot;End Commandline Options(*arg)&quot;)</span>
+<span id="L423" class="LineNr">423 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L98'>is_equal</a><span class="Delimiter">(</span>*arg<span class="Delimiter">,</span> <span class="Constant">&quot;--trace&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L424" class="LineNr">424 </span>  cerr &lt;&lt; <span class="Constant">&quot;saving <a href='003trace.cc.html#L96'>trace</a> to 'last_run'\n&quot;</span><span class="Delimiter">;</span>
+<span id="L425" class="LineNr">425 </span>  <span class="Special"><a href='003trace.cc.html#L421'>Trace_file</a></span><span class="Delimiter">.</span>open<span class="Delimiter">(</span><span class="Constant">&quot;last_run&quot;</span><span class="Delimiter">);</span>
+<span id="L426" class="LineNr">426 </span>  <span class="Comment">// Add a dummy line up top; otherwise the `browse_trace` tool currently has</span>
+<span id="L427" class="LineNr">427 </span>  <span class="Comment">// no way to expand any lines above an error.</span>
+<span id="L428" class="LineNr">428 </span>  <span class="Special"><a href='003trace.cc.html#L421'>Trace_file</a></span> &lt;&lt; <span class="Constant">&quot;   0 dummy: start\n&quot;</span><span class="Delimiter">;</span>
 <span id="L429" class="LineNr">429 </span><span class="Delimiter">}</span>
-<span id="L430" class="LineNr">430 </span>
-<span id="L431" class="LineNr">431 </span><span class="Delimiter">:(before &quot;End trace_stream Methods&quot;)</span>
-<span id="L432" class="LineNr">432 </span>string <a href='003trace.cc.html#L432'>readable_contents</a><span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L433" class="LineNr">433 </span>  string <a href='003trace.cc.html#L445'>trim</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">);</span>  <span class="Comment">// prototype</span>
-<span id="L434" class="LineNr">434 </span>  ostringstream output<span class="Delimiter">;</span>
-<span id="L435" class="LineNr">435 </span>  label = <a href='003trace.cc.html#L445'>trim</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
-<span id="L436" class="LineNr">436 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L78'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L78'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L437" class="LineNr">437 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>label<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> || label == p<span class="Delimiter">-&gt;</span>label<span class="Delimiter">)</span>
-<span id="L438" class="LineNr">438 </span>      output &lt;&lt; std::setw<span class="Delimiter">(</span><span class="Constant">4</span><span class="Delimiter">)</span> &lt;&lt; p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L133'>depth</a> &lt;&lt; <span class="Constant">' '</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>label &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L131'>contents</a> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L439" class="LineNr">439 </span>  <span class="Identifier">return</span> output<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L430" class="LineNr">430 </span><span class="Delimiter">:(before &quot;End <a href='003trace.cc.html#L96'>trace</a> Commit&quot;)</span>
+<span id="L431" class="LineNr">431 </span><span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='003trace.cc.html#L421'>Trace_file</a></span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L432" class="LineNr">432 </span>  <span class="Special"><a href='003trace.cc.html#L421'>Trace_file</a></span> &lt;&lt; std::setw<span class="Delimiter">(</span><span class="Constant">4</span><span class="Delimiter">)</span> &lt;&lt; t<span class="Delimiter">.</span><a href='003trace.cc.html#L119'>depth</a> &lt;&lt; <span class="Constant">' '</span> &lt;&lt; t<span class="Delimiter">.</span>label &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; t<span class="Delimiter">.</span><a href='003trace.cc.html#L117'>contents</a> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L433" class="LineNr">433 </span><span class="Delimiter">}</span>
+<span id="L434" class="LineNr">434 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
+<span id="L435" class="LineNr">435 </span>atexit<span class="Delimiter">(</span><a href='003trace.cc.html#L437'>cleanup_main</a><span class="Delimiter">);</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='003trace.cc.html#L437'>cleanup_main</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L438" class="LineNr">438 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='003trace.cc.html#L421'>Trace_file</a></span><span class="Delimiter">)</span> <span class="Special"><a href='003trace.cc.html#L421'>Trace_file</a></span><span class="Delimiter">.</span>close<span class="Delimiter">();</span>
+<span id="L439" class="LineNr">439 </span>  <span class="Comment">// End cleanup_main</span>
 <span id="L440" class="LineNr">440 </span><span class="Delimiter">}</span>
 <span id="L441" class="LineNr">441 </span>
-<span id="L442" class="LineNr">442 </span><span class="Comment">//: Miscellaneous helpers.</span>
-<span id="L443" class="LineNr">443 </span>
-<span id="L444" class="LineNr">444 </span><span class="Delimiter">:(code)</span>
-<span id="L445" class="LineNr">445 </span>string <a href='003trace.cc.html#L445'>trim</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L446" class="LineNr">446 </span>  string::const_iterator first = s<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>
-<span id="L447" class="LineNr">447 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>first != s<span class="Delimiter">.</span>end<span class="Delimiter">()</span> &amp;&amp; isspace<span class="Delimiter">(</span>*first<span class="Delimiter">))</span>
-<span id="L448" class="LineNr">448 </span>    ++first<span class="Delimiter">;</span>
-<span id="L449" class="LineNr">449 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>first == s<span class="Delimiter">.</span>end<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L450" class="LineNr">450 </span>
-<span id="L451" class="LineNr">451 </span>  string::const_iterator last = --s<span class="Delimiter">.</span>end<span class="Delimiter">();</span>
-<span id="L452" class="LineNr">452 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>last != s<span class="Delimiter">.</span>begin<span class="Delimiter">()</span> &amp;&amp; isspace<span class="Delimiter">(</span>*last<span class="Delimiter">))</span>
-<span id="L453" class="LineNr">453 </span>    --last<span class="Delimiter">;</span>
-<span id="L454" class="LineNr">454 </span>  ++last<span class="Delimiter">;</span>
-<span id="L455" class="LineNr">455 </span>  <span class="Identifier">return</span> string<span class="Delimiter">(</span>first<span class="Delimiter">,</span> last<span class="Delimiter">);</span>
-<span id="L456" class="LineNr">456 </span><span class="Delimiter">}</span>
-<span id="L457" class="LineNr">457 </span>
-<span id="L458" class="LineNr">458 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L459" class="LineNr">459 </span><span class="Comment">#include &lt;vector&gt;</span>
-<span id="L460" class="LineNr">460 </span><span class="Normal">using</span> std::vector<span class="Delimiter">;</span>
-<span id="L461" class="LineNr">461 </span><span class="Comment">#include &lt;list&gt;</span>
-<span id="L462" class="LineNr">462 </span><span class="Normal">using</span> std::list<span class="Delimiter">;</span>
-<span id="L463" class="LineNr">463 </span><span class="Comment">#include &lt;set&gt;</span>
-<span id="L464" class="LineNr">464 </span><span class="Normal">using</span> std::set<span class="Delimiter">;</span>
-<span id="L465" class="LineNr">465 </span>
-<span id="L466" class="LineNr">466 </span><span class="Comment">#include &lt;sstream&gt;</span>
-<span id="L467" class="LineNr">467 </span><span class="Normal">using</span> std::istringstream<span class="Delimiter">;</span>
-<span id="L468" class="LineNr">468 </span><span class="Normal">using</span> std::ostringstream<span class="Delimiter">;</span>
-<span id="L469" class="LineNr">469 </span>
-<span id="L470" class="LineNr">470 </span><span class="Comment">#include &lt;fstream&gt;</span>
-<span id="L471" class="LineNr">471 </span><span class="Normal">using</span> std::ifstream<span class="Delimiter">;</span>
-<span id="L472" class="LineNr">472 </span><span class="Normal">using</span> std::ofstream<span class="Delimiter">;</span>
+<span id="L442" class="LineNr">442 </span><span class="Delimiter">:(before &quot;End trace_stream Methods&quot;)</span>
+<span id="L443" class="LineNr">443 </span>string <a href='003trace.cc.html#L443'>readable_contents</a><span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L444" class="LineNr">444 </span>  string <a href='003trace.cc.html#L468'>trim</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">);</span>  <span class="Comment">// prototype</span>
+<span id="L445" class="LineNr">445 </span>  ostringstream output<span class="Delimiter">;</span>
+<span id="L446" class="LineNr">446 </span>  label = <a href='003trace.cc.html#L468'>trim</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
+<span id="L447" class="LineNr">447 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L76'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L76'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L448" class="LineNr">448 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>label<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> || label == p<span class="Delimiter">-&gt;</span>label<span class="Delimiter">)</span>
+<span id="L449" class="LineNr">449 </span>      output &lt;&lt; std::setw<span class="Delimiter">(</span><span class="Constant">4</span><span class="Delimiter">)</span> &lt;&lt; p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L119'>depth</a> &lt;&lt; <span class="Constant">' '</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>label &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L117'>contents</a> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L450" class="LineNr">450 </span>  <span class="Identifier">return</span> output<span class="Delimiter">.</span>str<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="Comment">//: Print traces to the screen as they happen.</span>
+<span id="L454" class="LineNr">454 </span><span class="Comment">//: Particularly useful when juggling multiple trace streams, like when</span>
+<span id="L455" class="LineNr">455 </span><span class="Comment">//: debugging sandboxes.</span>
+<span id="L456" class="LineNr">456 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L457" class="LineNr">457 </span><span class="Normal">bool</span> <span class="Special"><a href='003trace.cc.html#L457'>Dump_trace</a></span> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L458" class="LineNr">458 </span><span class="Delimiter">:(before &quot;End Commandline Options(*arg)&quot;)</span>
+<span id="L459" class="LineNr">459 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L98'>is_equal</a><span class="Delimiter">(</span>*arg<span class="Delimiter">,</span> <span class="Constant">&quot;--dump&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L460" class="LineNr">460 </span>  <span class="Special"><a href='003trace.cc.html#L457'>Dump_trace</a></span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L461" class="LineNr">461 </span><span class="Delimiter">}</span>
+<span id="L462" class="LineNr">462 </span><span class="Delimiter">:(before &quot;End Incremental Trace Print Conditions&quot;)</span>
+<span id="L463" class="LineNr">463 </span><span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='003trace.cc.html#L457'>Dump_trace</a></span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L464" class="LineNr">464 </span>
+<span id="L465" class="LineNr">465 </span><span class="Comment">//: Miscellaneous helpers.</span>
+<span id="L466" class="LineNr">466 </span>
+<span id="L467" class="LineNr">467 </span><span class="Delimiter">:(code)</span>
+<span id="L468" class="LineNr">468 </span>string <a href='003trace.cc.html#L468'>trim</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L469" class="LineNr">469 </span>  string::const_iterator first = s<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>
+<span id="L470" class="LineNr">470 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>first != s<span class="Delimiter">.</span>end<span class="Delimiter">()</span> &amp;&amp; isspace<span class="Delimiter">(</span>*first<span class="Delimiter">))</span>
+<span id="L471" class="LineNr">471 </span>    ++first<span class="Delimiter">;</span>
+<span id="L472" class="LineNr">472 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>first == s<span class="Delimiter">.</span>end<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L473" class="LineNr">473 </span>
+<span id="L474" class="LineNr">474 </span>  string::const_iterator last = --s<span class="Delimiter">.</span>end<span class="Delimiter">();</span>
+<span id="L475" class="LineNr">475 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>last != s<span class="Delimiter">.</span>begin<span class="Delimiter">()</span> &amp;&amp; isspace<span class="Delimiter">(</span>*last<span class="Delimiter">))</span>
+<span id="L476" class="LineNr">476 </span>    --last<span class="Delimiter">;</span>
+<span id="L477" class="LineNr">477 </span>  ++last<span class="Delimiter">;</span>
+<span id="L478" class="LineNr">478 </span>  <span class="Identifier">return</span> string<span class="Delimiter">(</span>first<span class="Delimiter">,</span> last<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="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L482" class="LineNr">482 </span><span class="PreProc">#include </span><span class="Constant">&lt;vector&gt;</span>
+<span id="L483" class="LineNr">483 </span><span class="Normal">using</span> std::vector<span class="Delimiter">;</span>
+<span id="L484" class="LineNr">484 </span><span class="PreProc">#include </span><span class="Constant">&lt;list&gt;</span>
+<span id="L485" class="LineNr">485 </span><span class="Normal">using</span> std::list<span class="Delimiter">;</span>
+<span id="L486" class="LineNr">486 </span><span class="PreProc">#include </span><span class="Constant">&lt;set&gt;</span>
+<span id="L487" class="LineNr">487 </span><span class="Normal">using</span> std::set<span class="Delimiter">;</span>
+<span id="L488" class="LineNr">488 </span>
+<span id="L489" class="LineNr">489 </span><span class="PreProc">#include </span><span class="Constant">&lt;sstream&gt;</span>
+<span id="L490" class="LineNr">490 </span><span class="Normal">using</span> std::istringstream<span class="Delimiter">;</span>
+<span id="L491" class="LineNr">491 </span><span class="Normal">using</span> std::ostringstream<span class="Delimiter">;</span>
+<span id="L492" class="LineNr">492 </span>
+<span id="L493" class="LineNr">493 </span><span class="PreProc">#include </span><span class="Constant">&lt;fstream&gt;</span>
+<span id="L494" class="LineNr">494 </span><span class="Normal">using</span> std::ifstream<span class="Delimiter">;</span>
+<span id="L495" class="LineNr">495 </span><span class="Normal">using</span> std::ofstream<span class="Delimiter">;</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/003trace.test.cc.html b/html/subx/003trace.test.cc.html
index 7814cfed..5c6fe027 100644
--- a/html/subx/003trace.test.cc.html
+++ b/html/subx/003trace.test.cc.html
@@ -55,131 +55,133 @@ if ('onhashchange' in window) {
 <a href='https://github.com/akkartik/mu/blob/master/subx/003trace.test.cc'>https://github.com/akkartik/mu/blob/master/subx/003trace.test.cc</a>
 <pre id='vimCodeElement'>
 <span id="L1" class="LineNr">  1 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L1'>test_trace_check_compares</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L2" class="LineNr">  2 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L3" class="LineNr">  3 </span>  <a href='003trace.cc.html#L258'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer: foo&quot;</span><span class="Delimiter">);</span>
+<span id="L2" class="LineNr">  2 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L3" class="LineNr">  3 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer: foo&quot;</span><span class="Delimiter">);</span>
 <span id="L4" class="LineNr">  4 </span><span class="Delimiter">}</span>
 <span id="L5" class="LineNr">  5 </span>
 <span id="L6" class="LineNr">  6 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L6'>test_trace_check_ignores_other_layers</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L7" class="LineNr">  7 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L8" class="LineNr">  8 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 2&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L9" class="LineNr">  9 </span>  <a href='003trace.cc.html#L258'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo&quot;</span><span class="Delimiter">);</span>
-<span id="L10" class="LineNr"> 10 </span>  <a href='003trace.cc.html#L260'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 2: foo&quot;</span><span class="Delimiter">);</span>
+<span id="L7" class="LineNr">  7 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L8" class="LineNr">  8 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 2&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L9" class="LineNr">  9 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo&quot;</span><span class="Delimiter">);</span>
+<span id="L10" class="LineNr"> 10 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 2: foo&quot;</span><span class="Delimiter">);</span>
 <span id="L11" class="LineNr"> 11 </span><span class="Delimiter">}</span>
 <span id="L12" class="LineNr"> 12 </span>
 <span id="L13" class="LineNr"> 13 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L13'>test_trace_check_ignores_leading_whitespace</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L14" class="LineNr"> 14 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L14" class="LineNr"> 14 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L15" class="LineNr"> 15 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>trace_count<span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">too little whitespace</span><span class="Comment">*/</span><span class="Constant">&quot;foo&quot;</span><span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L16" class="LineNr"> 16 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>trace_count<span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">too much whitespace</span><span class="Comment">*/</span><span class="Constant">&quot;  foo&quot;</span><span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L17" class="LineNr"> 17 </span><span class="Delimiter">}</span>
 <span id="L18" class="LineNr"> 18 </span>
 <span id="L19" class="LineNr"> 19 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L19'>test_trace_check_ignores_other_lines</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L20" class="LineNr"> 20 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L22" class="LineNr"> 22 </span>  <a href='003trace.cc.html#L258'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo&quot;</span><span class="Delimiter">);</span>
+<span id="L20" class="LineNr"> 20 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L22" class="LineNr"> 22 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo&quot;</span><span class="Delimiter">);</span>
 <span id="L23" class="LineNr"> 23 </span><span class="Delimiter">}</span>
 <span id="L24" class="LineNr"> 24 </span>
 <span id="L25" class="LineNr"> 25 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L25'>test_trace_check_ignores_other_lines2</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L26" class="LineNr"> 26 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L27" class="LineNr"> 27 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L28" class="LineNr"> 28 </span>  <a href='003trace.cc.html#L258'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: bar&quot;</span><span class="Delimiter">);</span>
+<span id="L26" class="LineNr"> 26 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L27" class="LineNr"> 27 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L28" class="LineNr"> 28 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: bar&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 id="L31" class="LineNr"> 31 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L31'>test_trace_ignores_trailing_whitespace</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L32" class="LineNr"> 32 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L33" class="LineNr"> 33 </span>  <a href='003trace.cc.html#L258'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo&quot;</span><span class="Delimiter">);</span>
+<span id="L32" class="LineNr"> 32 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L33" class="LineNr"> 33 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo&quot;</span><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> <a href='003trace.test.cc.html#L36'>test_trace_ignores_trailing_whitespace2</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L37" class="LineNr"> 37 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo &quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L38" class="LineNr"> 38 </span>  <a href='003trace.cc.html#L258'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo&quot;</span><span class="Delimiter">);</span>
+<span id="L37" class="LineNr"> 37 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo &quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L38" class="LineNr"> 38 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo&quot;</span><span class="Delimiter">);</span>
 <span id="L39" class="LineNr"> 39 </span><span class="Delimiter">}</span>
 <span id="L40" class="LineNr"> 40 </span>
 <span id="L41" class="LineNr"> 41 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L41'>test_trace_orders_across_layers</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L42" class="LineNr"> 42 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L43" class="LineNr"> 43 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 2&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L44" class="LineNr"> 44 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;qux&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L45" class="LineNr"> 45 </span>  <a href='003trace.cc.html#L258'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo^Dtest layer 2: bar^Dtest layer 1: qux^D&quot;</span><span class="Delimiter">);</span>
-<span id="L46" class="LineNr"> 46 </span><span class="Delimiter">}</span>
-<span id="L47" class="LineNr"> 47 </span>
-<span id="L48" class="LineNr"> 48 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L48'>test_trace_supports_count</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L49" class="LineNr"> 49 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L50" class="LineNr"> 50 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L51" class="LineNr"> 51 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>trace_count<span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;foo&quot;</span><span class="Delimiter">),</span> <span class="Constant">2</span><span class="Delimiter">);</span>
-<span id="L52" class="LineNr"> 52 </span><span class="Delimiter">}</span>
-<span id="L53" class="LineNr"> 53 </span>
-<span id="L54" class="LineNr"> 54 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L54'>test_trace_supports_count2</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L55" class="LineNr"> 55 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L56" class="LineNr"> 56 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L57" class="LineNr"> 57 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>trace_count<span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">),</span> <span class="Constant">2</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='003trace.test.cc.html#L60'>test_trace_count_ignores_trailing_whitespace</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L61" class="LineNr"> 61 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L62" class="LineNr"> 62 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>trace_count<span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;foo&quot;</span><span class="Delimiter">),</span> <span class="Constant">1</span><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="Comment">// pending: DUMP tests</span>
-<span id="L66" class="LineNr"> 66 </span><span class="Comment">// pending: readable_contents() adds newline if necessary.</span>
-<span id="L67" class="LineNr"> 67 </span><span class="Comment">// pending: raise also prints to stderr.</span>
-<span id="L68" class="LineNr"> 68 </span><span class="Comment">// pending: raise doesn't print to stderr if Hide_errors is set.</span>
-<span id="L69" class="LineNr"> 69 </span><span class="Comment">// pending: warn doesn't print to stderr if Hide_errors is set.</span>
-<span id="L70" class="LineNr"> 70 </span><span class="Comment">// pending: warn doesn't print to stderr if Hide_warnings is set.</span>
-<span id="L71" class="LineNr"> 71 </span><span class="Comment">// pending: raise doesn't have to be saved if Hide_errors is set, just printed.</span>
-<span id="L72" class="LineNr"> 72 </span><span class="Comment">// pending: raise prints to stderr if Trace_stream is NULL.</span>
-<span id="L73" class="LineNr"> 73 </span><span class="Comment">// pending: raise prints to stderr if Trace_stream is NULL even if Hide_errors is set.</span>
-<span id="L74" class="LineNr"> 74 </span>
-<span id="L75" class="LineNr"> 75 </span><span class="Comment">// can't check trace because trace methods call 'split'</span>
+<span id="L42" class="LineNr"> 42 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L43" class="LineNr"> 43 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 2&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L44" class="LineNr"> 44 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;qux&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L45" class="LineNr"> 45 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo\n&quot;</span>
+<span id="L46" class="LineNr"> 46 </span>                       <span class="Constant">&quot;test layer 2: bar\n&quot;</span>
+<span id="L47" class="LineNr"> 47 </span>                       <span class="Constant">&quot;test layer 1: qux\n&quot;</span><span class="Delimiter">);</span>
+<span id="L48" class="LineNr"> 48 </span><span class="Delimiter">}</span>
+<span id="L49" class="LineNr"> 49 </span>
+<span id="L50" class="LineNr"> 50 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L50'>test_trace_supports_count</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L51" class="LineNr"> 51 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L52" class="LineNr"> 52 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L53" class="LineNr"> 53 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>trace_count<span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;foo&quot;</span><span class="Delimiter">),</span> <span class="Constant">2</span><span class="Delimiter">);</span>
+<span id="L54" class="LineNr"> 54 </span><span class="Delimiter">}</span>
+<span id="L55" class="LineNr"> 55 </span>
+<span id="L56" class="LineNr"> 56 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L56'>test_trace_supports_count2</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L57" class="LineNr"> 57 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L58" class="LineNr"> 58 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L59" class="LineNr"> 59 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>trace_count<span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">),</span> <span class="Constant">2</span><span class="Delimiter">);</span>
+<span id="L60" class="LineNr"> 60 </span><span class="Delimiter">}</span>
+<span id="L61" class="LineNr"> 61 </span>
+<span id="L62" class="LineNr"> 62 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L62'>test_trace_count_ignores_trailing_whitespace</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L63" class="LineNr"> 63 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L64" class="LineNr"> 64 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>trace_count<span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;foo&quot;</span><span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L65" class="LineNr"> 65 </span><span class="Delimiter">}</span>
+<span id="L66" class="LineNr"> 66 </span>
+<span id="L67" class="LineNr"> 67 </span><span class="Comment">// pending: DUMP tests</span>
+<span id="L68" class="LineNr"> 68 </span><span class="Comment">// pending: readable_contents() adds newline if necessary.</span>
+<span id="L69" class="LineNr"> 69 </span><span class="Comment">// pending: raise also prints to stderr.</span>
+<span id="L70" class="LineNr"> 70 </span><span class="Comment">// pending: raise doesn't print to stderr if Hide_errors is set.</span>
+<span id="L71" class="LineNr"> 71 </span><span class="Comment">// pending: warn doesn't print to stderr if Hide_errors is set.</span>
+<span id="L72" class="LineNr"> 72 </span><span class="Comment">// pending: warn doesn't print to stderr if Hide_warnings is set.</span>
+<span id="L73" class="LineNr"> 73 </span><span class="Comment">// pending: raise doesn't have to be saved if Hide_errors is set, just printed.</span>
+<span id="L74" class="LineNr"> 74 </span><span class="Comment">// pending: raise prints to stderr if Trace_stream is NULL.</span>
+<span id="L75" class="LineNr"> 75 </span><span class="Comment">// pending: raise prints to stderr if Trace_stream is NULL even if Hide_errors is set.</span>
 <span id="L76" class="LineNr"> 76 </span>
-<span id="L77" class="LineNr"> 77 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L77'>test_split_returns_at_least_one_elem</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L78" class="LineNr"> 78 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L374'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,&quot;</span><span class="Delimiter">);</span>
-<span id="L79" class="LineNr"> 79 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L80" class="LineNr"> 80 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L81" class="LineNr"> 81 </span><span class="Delimiter">}</span>
-<span id="L82" class="LineNr"> 82 </span>
-<span id="L83" class="LineNr"> 83 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L83'>test_split_returns_entire_input_when_no_delim</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L84" class="LineNr"> 84 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L374'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;abc&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,&quot;</span><span class="Delimiter">);</span>
-<span id="L85" class="LineNr"> 85 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L86" class="LineNr"> 86 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">&quot;abc&quot;</span><span class="Delimiter">);</span>
-<span id="L87" class="LineNr"> 87 </span><span class="Delimiter">}</span>
-<span id="L88" class="LineNr"> 88 </span>
-<span id="L89" class="LineNr"> 89 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L89'>test_split_works</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L90" class="LineNr"> 90 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L374'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;abc,def&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,&quot;</span><span class="Delimiter">);</span>
-<span id="L91" class="LineNr"> 91 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">2</span><span class="Delimiter">);</span>
-<span id="L92" class="LineNr"> 92 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">&quot;abc&quot;</span><span class="Delimiter">);</span>
-<span id="L93" class="LineNr"> 93 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">),</span> <span class="Constant">&quot;def&quot;</span><span class="Delimiter">);</span>
-<span id="L94" class="LineNr"> 94 </span><span class="Delimiter">}</span>
-<span id="L95" class="LineNr"> 95 </span>
-<span id="L96" class="LineNr"> 96 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L96'>test_split_works2</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L97" class="LineNr"> 97 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L374'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;abc,def,ghi&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,&quot;</span><span class="Delimiter">);</span>
-<span id="L98" class="LineNr"> 98 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">3</span><span class="Delimiter">);</span>
-<span id="L99" class="LineNr"> 99 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">&quot;abc&quot;</span><span class="Delimiter">);</span>
-<span id="L100" class="LineNr">100 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">),</span> <span class="Constant">&quot;def&quot;</span><span class="Delimiter">);</span>
-<span id="L101" class="LineNr">101 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">),</span> <span class="Constant">&quot;ghi&quot;</span><span class="Delimiter">);</span>
-<span id="L102" class="LineNr">102 </span><span class="Delimiter">}</span>
-<span id="L103" class="LineNr">103 </span>
-<span id="L104" class="LineNr">104 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L104'>test_split_handles_multichar_delim</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L105" class="LineNr">105 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L374'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;abc,,def,,ghi&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,,&quot;</span><span class="Delimiter">);</span>
-<span id="L106" class="LineNr">106 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">3</span><span class="Delimiter">);</span>
-<span id="L107" class="LineNr">107 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">&quot;abc&quot;</span><span class="Delimiter">);</span>
-<span id="L108" class="LineNr">108 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">),</span> <span class="Constant">&quot;def&quot;</span><span class="Delimiter">);</span>
-<span id="L109" class="LineNr">109 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">),</span> <span class="Constant">&quot;ghi&quot;</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='003trace.test.cc.html#L112'>test_trim</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L113" class="LineNr">113 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L445'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L114" class="LineNr">114 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L445'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot; &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L115" class="LineNr">115 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L445'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L116" class="LineNr">116 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L445'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;a&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
-<span id="L117" class="LineNr">117 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L445'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot; a&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
-<span id="L118" class="LineNr">118 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L445'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  a&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
-<span id="L119" class="LineNr">119 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L445'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  ab&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;ab&quot;</span><span class="Delimiter">);</span>
-<span id="L120" class="LineNr">120 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L445'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;a &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
-<span id="L121" class="LineNr">121 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L445'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;a  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
-<span id="L122" class="LineNr">122 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L445'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;ab  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;ab&quot;</span><span class="Delimiter">);</span>
-<span id="L123" class="LineNr">123 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L445'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot; a &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
-<span id="L124" class="LineNr">124 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L445'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  a  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
-<span id="L125" class="LineNr">125 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L445'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  ab  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;ab&quot;</span><span class="Delimiter">);</span>
-<span id="L126" class="LineNr">126 </span><span class="Delimiter">}</span>
+<span id="L77" class="LineNr"> 77 </span><span class="Comment">// can't check trace because trace methods call 'split'</span>
+<span id="L78" class="LineNr"> 78 </span>
+<span id="L79" class="LineNr"> 79 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L79'>test_split_returns_at_least_one_elem</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L80" class="LineNr"> 80 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L382'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,&quot;</span><span class="Delimiter">);</span>
+<span id="L81" class="LineNr"> 81 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L82" class="LineNr"> 82 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">&quot;&quot;</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='003trace.test.cc.html#L85'>test_split_returns_entire_input_when_no_delim</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L86" class="LineNr"> 86 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L382'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;abc&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,&quot;</span><span class="Delimiter">);</span>
+<span id="L87" class="LineNr"> 87 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L88" class="LineNr"> 88 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">&quot;abc&quot;</span><span class="Delimiter">);</span>
+<span id="L89" class="LineNr"> 89 </span><span class="Delimiter">}</span>
+<span id="L90" class="LineNr"> 90 </span>
+<span id="L91" class="LineNr"> 91 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L91'>test_split_works</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L92" class="LineNr"> 92 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L382'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;abc,def&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,&quot;</span><span class="Delimiter">);</span>
+<span id="L93" class="LineNr"> 93 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">2</span><span class="Delimiter">);</span>
+<span id="L94" class="LineNr"> 94 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">&quot;abc&quot;</span><span class="Delimiter">);</span>
+<span id="L95" class="LineNr"> 95 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">),</span> <span class="Constant">&quot;def&quot;</span><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="Normal">void</span> <a href='003trace.test.cc.html#L98'>test_split_works2</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L99" class="LineNr"> 99 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L382'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;abc,def,ghi&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,&quot;</span><span class="Delimiter">);</span>
+<span id="L100" class="LineNr">100 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">3</span><span class="Delimiter">);</span>
+<span id="L101" class="LineNr">101 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">&quot;abc&quot;</span><span class="Delimiter">);</span>
+<span id="L102" class="LineNr">102 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">),</span> <span class="Constant">&quot;def&quot;</span><span class="Delimiter">);</span>
+<span id="L103" class="LineNr">103 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">),</span> <span class="Constant">&quot;ghi&quot;</span><span class="Delimiter">);</span>
+<span id="L104" class="LineNr">104 </span><span class="Delimiter">}</span>
+<span id="L105" class="LineNr">105 </span>
+<span id="L106" class="LineNr">106 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L106'>test_split_handles_multichar_delim</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L107" class="LineNr">107 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L382'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;abc,,def,,ghi&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,,&quot;</span><span class="Delimiter">);</span>
+<span id="L108" class="LineNr">108 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">3</span><span class="Delimiter">);</span>
+<span id="L109" class="LineNr">109 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">&quot;abc&quot;</span><span class="Delimiter">);</span>
+<span id="L110" class="LineNr">110 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">),</span> <span class="Constant">&quot;def&quot;</span><span class="Delimiter">);</span>
+<span id="L111" class="LineNr">111 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">),</span> <span class="Constant">&quot;ghi&quot;</span><span class="Delimiter">);</span>
+<span id="L112" class="LineNr">112 </span><span class="Delimiter">}</span>
+<span id="L113" class="LineNr">113 </span>
+<span id="L114" class="LineNr">114 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L114'>test_trim</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L115" class="LineNr">115 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L468'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L116" class="LineNr">116 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L468'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot; &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L117" class="LineNr">117 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L468'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L118" class="LineNr">118 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L468'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;a&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
+<span id="L119" class="LineNr">119 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L468'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot; a&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
+<span id="L120" class="LineNr">120 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L468'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  a&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
+<span id="L121" class="LineNr">121 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L468'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  ab&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;ab&quot;</span><span class="Delimiter">);</span>
+<span id="L122" class="LineNr">122 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L468'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;a &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
+<span id="L123" class="LineNr">123 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L468'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;a  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
+<span id="L124" class="LineNr">124 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L468'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;ab  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;ab&quot;</span><span class="Delimiter">);</span>
+<span id="L125" class="LineNr">125 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L468'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot; a &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
+<span id="L126" class="LineNr">126 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L468'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  a  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
+<span id="L127" class="LineNr">127 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L468'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  ab  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;ab&quot;</span><span class="Delimiter">);</span>
+<span id="L128" class="LineNr">128 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/010---vm.cc.html b/html/subx/010---vm.cc.html
index e90d919b..fdfc6419 100644
--- a/html/subx/010---vm.cc.html
+++ b/html/subx/010---vm.cc.html
@@ -15,6 +15,7 @@ body { font-size:12pt; font-family: monospace; color: #000000; background-color:
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
 .cSpecial { color: #008000; }
+.PreProc { color: #c000c0; }
 .LineNr { }
 .Constant { color: #008787; }
 .Delimiter { color: #c000c0; }
@@ -136,11 +137,11 @@ if ('onhashchange' in window) {
 <span id="L76" class="LineNr"> 76 </span>
 <span id="L77" class="LineNr"> 77 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
 <span id="L78" class="LineNr"> 78 </span><span class="Comment">// the subset of x86 flag registers we care about</span>
-<span id="L79" class="LineNr"> 79 </span><span class="Normal">bool</span> SF =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// sign flag</span>
-<span id="L80" class="LineNr"> 80 </span><span class="Normal">bool</span> ZF =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// zero flag</span>
-<span id="L81" class="LineNr"> 81 </span><span class="Normal">bool</span> <a href='010---vm.cc.html#L81'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// overflow flag</span>
+<span id="L79" class="LineNr"> 79 </span><span class="Normal">bool</span> SF = <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// sign flag</span>
+<span id="L80" class="LineNr"> 80 </span><span class="Normal">bool</span> <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// zero flag</span>
+<span id="L81" class="LineNr"> 81 </span><span class="Normal">bool</span> <a href='010---vm.cc.html#L81'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// overflow flag</span>
 <span id="L82" class="LineNr"> 82 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
-<span id="L83" class="LineNr"> 83 </span>SF = ZF = <a href='010---vm.cc.html#L81'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L83" class="LineNr"> 83 </span>SF = <a href='010---vm.cc.html#L80'>ZF</a> = <a href='010---vm.cc.html#L81'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L84" class="LineNr"> 84 </span>
 <span id="L85" class="LineNr"> 85 </span><span class="Comment">//: how the flag registers are updated after each instruction</span>
 <span id="L86" class="LineNr"> 86 </span>
@@ -148,25 +149,25 @@ if ('onhashchange' in window) {
 <span id="L88" class="LineNr"> 88 </span><span class="Comment">// Combine 'arg1' and 'arg2' with arithmetic operation 'op' and store the</span>
 <span id="L89" class="LineNr"> 89 </span><span class="Comment">// result in 'arg1', then update flags.</span>
 <span id="L90" class="LineNr"> 90 </span><span class="Comment">// beware: no side-effects in args</span>
-<span id="L91" class="LineNr"> 91 </span><span class="Comment">#define BINARY_ARITHMETIC_OP(op, arg1, arg2) { \</span>
-<span id="L92" class="LineNr"> 92 </span>  <span class="Comment">/*</span><span class="Comment"> arg1 and arg2 must be signed </span><span class="Comment">*/</span> \
-<span id="L93" class="LineNr"> 93 </span>  <span class="Normal">int64_t</span> tmp = arg1 op arg2<span class="Delimiter">;</span> \
-<span id="L94" class="LineNr"> 94 </span>  arg1 = arg1 op arg2<span class="Delimiter">;</span> \
-<span id="L95" class="LineNr"> 95 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L433'>HEXWORD</a> &lt;&lt; arg1 &lt;&lt; end<span class="Delimiter">();</span> \
-<span id="L96" class="LineNr"> 96 </span>  SF = <span class="Delimiter">(</span>arg1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span> \
-<span id="L97" class="LineNr"> 97 </span>  ZF = <span class="Delimiter">(</span>arg1 == <span class="Constant">0</span><span class="Delimiter">);</span> \
-<span id="L98" class="LineNr"> 98 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>arg1 != tmp<span class="Delimiter">);</span> \
+<span id="L91" class="LineNr"> 91 </span><span class="PreProc">#define BINARY_ARITHMETIC_OP(op</span><span class="Delimiter">,</span><span class="PreProc"> arg1</span><span class="Delimiter">,</span><span class="PreProc"> arg2) </span><span class="Delimiter">{</span><span class="PreProc"> \</span>
+<span id="L92" class="LineNr"> 92 </span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> arg1 and arg2 must be signed </span><span class="Comment">*/</span><span class="PreProc"> \</span>
+<span id="L93" class="LineNr"> 93 </span><span class="PreProc">  </span><span class="Normal">int64_t</span><span class="PreProc"> tmp = arg1 op arg2</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L94" class="LineNr"> 94 </span><span class="PreProc">  arg1 = arg1 op arg2</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L95" class="LineNr"> 95 </span><span class="PreProc">  trace(</span><span class="Special">Callstack_depth</span><span class="PreProc">+</span><span class="Constant">1</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">&quot;run&quot;</span><span class="PreProc">) &lt;&lt; </span><span class="Constant">&quot;storing 0x&quot;</span><span class="PreProc"> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; arg1 &lt;&lt; end()</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L96" class="LineNr"> 96 </span><span class="PreProc">  SF = (arg1 &lt; </span><span class="Constant">0</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L97" class="LineNr"> 97 </span><span class="PreProc">  <a href='010---vm.cc.html#L80'>ZF</a> = (arg1 == </span><span class="Constant">0</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L98" class="LineNr"> 98 </span><span class="PreProc">  <a href='010---vm.cc.html#L81'>OF</a> = (arg1 != tmp)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
 <span id="L99" class="LineNr"> 99 </span><span class="Delimiter">}</span>
 <span id="L100" class="LineNr">100 </span>
 <span id="L101" class="LineNr">101 </span><span class="Comment">// Combine 'arg1' and 'arg2' with bitwise operation 'op' and store the result</span>
 <span id="L102" class="LineNr">102 </span><span class="Comment">// in 'arg1', then update flags.</span>
-<span id="L103" class="LineNr">103 </span><span class="Comment">#define BINARY_BITWISE_OP(op, arg1, arg2) { \</span>
-<span id="L104" class="LineNr">104 </span>  <span class="Comment">/*</span><span class="Comment"> arg1 and arg2 must be unsigned </span><span class="Comment">*/</span> \
-<span id="L105" class="LineNr">105 </span>  arg1 = arg1 op arg2<span class="Delimiter">;</span> \
-<span id="L106" class="LineNr">106 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L433'>HEXWORD</a> &lt;&lt; arg1 &lt;&lt; end<span class="Delimiter">();</span> \
-<span id="L107" class="LineNr">107 </span>  SF = <span class="Delimiter">(</span>arg1 &gt;&gt; <span class="Constant">31</span><span class="Delimiter">);</span> \
-<span id="L108" class="LineNr">108 </span>  ZF = <span class="Delimiter">(</span>arg1 == <span class="Constant">0</span><span class="Delimiter">);</span> \
-<span id="L109" class="LineNr">109 </span>  <a href='010---vm.cc.html#L81'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span> \
+<span id="L103" class="LineNr">103 </span><span class="PreProc">#define BINARY_BITWISE_OP(op</span><span class="Delimiter">,</span><span class="PreProc"> arg1</span><span class="Delimiter">,</span><span class="PreProc"> arg2) </span><span class="Delimiter">{</span><span class="PreProc"> \</span>
+<span id="L104" class="LineNr">104 </span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> arg1 and arg2 must be unsigned </span><span class="Comment">*/</span><span class="PreProc"> \</span>
+<span id="L105" class="LineNr">105 </span><span class="PreProc">  arg1 = arg1 op arg2</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L106" class="LineNr">106 </span><span class="PreProc">  trace(</span><span class="Special">Callstack_depth</span><span class="PreProc">+</span><span class="Constant">1</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">&quot;run&quot;</span><span class="PreProc">) &lt;&lt; </span><span class="Constant">&quot;storing 0x&quot;</span><span class="PreProc"> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; arg1 &lt;&lt; end()</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L107" class="LineNr">107 </span><span class="PreProc">  SF = (arg1 &gt;&gt; </span><span class="Constant">31</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L108" class="LineNr">108 </span><span class="PreProc">  <a href='010---vm.cc.html#L80'>ZF</a> = (arg1 == </span><span class="Constant">0</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L109" class="LineNr">109 </span><span class="PreProc">  <a href='010---vm.cc.html#L81'>OF</a> = </span><span class="Constant">false</span><span class="Delimiter">;</span><span class="PreProc"> \</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="SalientComment">//:: simulated RAM</span>
@@ -219,12 +220,12 @@ if ('onhashchange' in window) {
 <span id="L159" class="LineNr">159 </span><span class="Delimiter">};</span>
 <span id="L160" class="LineNr">160 </span><span class="Delimiter">:(code)</span>
 <span id="L161" class="LineNr">161 </span><span class="Normal">void</span> <a href='010---vm.cc.html#L161'>sanity_check</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> start<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> end<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L162" class="LineNr">162 </span>  <span class="Normal">bool</span> dup_found =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L162" class="LineNr">162 </span>  <span class="Normal">bool</span> dup_found = <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L163" class="LineNr">163 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L164" class="LineNr">164 </span>    <span class="Normal">const</span> vma&amp; curr = <span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L165" class="LineNr">165 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>start == start<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L166" class="LineNr">166 </span>      assert<span class="Delimiter">(</span>!dup_found<span class="Delimiter">);</span>
-<span id="L167" class="LineNr">167 </span>      dup_found =<span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L167" class="LineNr">167 </span>      dup_found = <span class="Constant">true</span><span class="Delimiter">;</span>
 <span id="L168" class="LineNr">168 </span>    <span class="Delimiter">}</span>
 <span id="L169" class="LineNr">169 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>start &gt; start<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L170" class="LineNr">170 </span>      assert<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>start &gt; end<span class="Delimiter">);</span>
@@ -279,12 +280,12 @@ if ('onhashchange' in window) {
 <span id="L219" class="LineNr">219 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L220" class="LineNr">220 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='010---vm.cc.html#L128'>match</a><span class="Delimiter">(</span>addr<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L221" class="LineNr">221 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">)</span>
-<span id="L222" class="LineNr">222 </span>        <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; is in two segments\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L222" class="LineNr">222 </span>        <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; is in two segments\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L223" class="LineNr">223 </span>      result = &amp;<span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>data<span class="Delimiter">(</span>addr<span class="Delimiter">);</span>
 <span id="L224" class="LineNr">224 </span>    <span class="Delimiter">}</span>
 <span id="L225" class="LineNr">225 </span>  <span class="Delimiter">}</span>
 <span id="L226" class="LineNr">226 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>result == <span class="Constant">NULL</span><span class="Delimiter">)</span>
-<span id="L227" class="LineNr">227 </span>    <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;Tried to access uninitialized memory at address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L227" class="LineNr">227 </span>    <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;Tried to access uninitialized memory at address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L228" class="LineNr">228 </span>  <span class="Identifier">return</span> result<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">inline</span> <span class="Normal">int8_t</span>* <a href='010---vm.cc.html#L230'>mem_addr_i8</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -295,13 +296,13 @@ if ('onhashchange' in window) {
 <span id="L235" class="LineNr">235 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L236" class="LineNr">236 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='010---vm.cc.html#L131'>match32</a><span class="Delimiter">(</span>addr<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L237" class="LineNr">237 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">)</span>
-<span id="L238" class="LineNr">238 </span>        <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; is in two segments\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L238" class="LineNr">238 </span>        <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; is in two segments\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L239" class="LineNr">239 </span>      result = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint32_t</span>*&gt;<span class="Delimiter">(</span>&amp;<span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>data<span class="Delimiter">(</span>addr<span class="Delimiter">));</span>
 <span id="L240" class="LineNr">240 </span>    <span class="Delimiter">}</span>
 <span id="L241" class="LineNr">241 </span>  <span class="Delimiter">}</span>
 <span id="L242" class="LineNr">242 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>result == <span class="Constant">NULL</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L243" class="LineNr">243 </span>    <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;Tried to access uninitialized memory at address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L244" class="LineNr">244 </span>    <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;The entire 4-byte <a href='011run.cc.html#L119'>word</a> should be initialized and lie in a single segment.\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L243" class="LineNr">243 </span>    <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;Tried to access uninitialized memory at address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L244" class="LineNr">244 </span>    <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;The entire 4-byte <a href='011run.cc.html#L126'>word</a> should be initialized and lie in a single segment.\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L245" class="LineNr">245 </span>  <span class="Delimiter">}</span>
 <span id="L246" class="LineNr">246 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L247" class="LineNr">247 </span><span class="Delimiter">}</span>
@@ -338,12 +339,12 @@ if ('onhashchange' in window) {
 <span id="L278" class="LineNr">278 </span><span class="Delimiter">}</span>
 <span id="L279" class="LineNr">279 </span>
 <span id="L280" class="LineNr">280 </span><span class="Normal">inline</span> <span class="Normal">bool</span> <a href='010---vm.cc.html#L280'>already_allocated</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L281" class="LineNr">281 </span>  <span class="Normal">bool</span> result =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L281" class="LineNr">281 </span>  <span class="Normal">bool</span> result = <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L282" class="LineNr">282 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L283" class="LineNr">283 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='010---vm.cc.html#L128'>match</a><span class="Delimiter">(</span>addr<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L284" class="LineNr">284 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">)</span>
-<span id="L285" class="LineNr">285 </span>        <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; is in two segments\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L286" class="LineNr">286 </span>      result =<span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L285" class="LineNr">285 </span>        <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; is in two segments\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L286" class="LineNr">286 </span>      result = <span class="Constant">true</span><span class="Delimiter">;</span>
 <span id="L287" class="LineNr">287 </span>    <span class="Delimiter">}</span>
 <span id="L288" class="LineNr">288 </span>  <span class="Delimiter">}</span>
 <span id="L289" class="LineNr">289 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
@@ -356,13 +357,13 @@ if ('onhashchange' in window) {
 <span id="L296" class="LineNr">296 </span><span class="Normal">void</span> <a href='010---vm.cc.html#L296'>run_one_instruction</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
 <span id="L297" class="LineNr">297 </span>  <span class="Normal">uint8_t</span> op=<span class="Constant">0</span><span class="Delimiter">,</span> op2=<span class="Constant">0</span><span class="Delimiter">,</span> op3=<span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L298" class="LineNr">298 </span>  <span class="Comment">// Run One Instruction</span>
-<span id="L299" class="LineNr">299 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='003trace.cc.html#L413'>Trace_file</a></span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L299" class="LineNr">299 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='003trace.cc.html#L421'>Trace_file</a></span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L300" class="LineNr">300 </span>    <a href='010---vm.cc.html#L367'>dump_registers</a><span class="Delimiter">();</span>
 <span id="L301" class="LineNr">301 </span>    <span class="Comment">// End Dump Info for Instruction</span>
 <span id="L302" class="LineNr">302 </span>  <span class="Delimiter">}</span>
 <span id="L303" class="LineNr">303 </span>  <span class="Normal">uint32_t</span> inst_start_address = EIP<span class="Delimiter">;</span>
 <span id="L304" class="LineNr">304 </span>  op = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L305" class="LineNr">305 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; inst_start_address &lt;&lt; <span class="Constant">&quot; opcode: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L432'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Delimiter">(</span>op == <span class="Constant">0xe8</span> ? <span class="Constant">&quot;/call&quot;</span> : <span class="Constant">&quot;&quot;</span><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L305" class="LineNr">305 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; inst_start_address &lt;&lt; <span class="Constant">&quot; opcode: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L439'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <a href='010---vm.cc.html#L379'>call_label</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L306" class="LineNr">306 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L307" class="LineNr">307 </span>  <span class="Normal">case</span> <span class="Constant">0xf4</span>:  <span class="Comment">// hlt</span>
 <span id="L308" class="LineNr">308 </span>    EIP = <span class="Special"><a href='010---vm.cc.html#L194'>End_of_program</a></span><span class="Delimiter">;</span>
@@ -372,8 +373,8 @@ if ('onhashchange' in window) {
 <span id="L312" class="LineNr">312 </span>    <span class="Normal">switch</span><span class="Delimiter">(</span>op2 = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L313" class="LineNr">313 </span>    <span class="Comment">// End Two-Byte Opcodes Starting With 0f</span>
 <span id="L314" class="LineNr">314 </span>    <span class="Normal">default</span>:
-<span id="L315" class="LineNr">315 </span>      cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after 0f: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L432'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L316" class="LineNr">316 </span>      <a href='003trace.cc.html#L402'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L315" class="LineNr">315 </span>      cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after 0f: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L439'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L316" class="LineNr">316 </span>      <a href='003trace.cc.html#L410'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L317" class="LineNr">317 </span>      exit<span class="Delimiter">(</span><span class="Constant">1</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">break</span><span class="Delimiter">;</span>
@@ -384,14 +385,14 @@ if ('onhashchange' in window) {
 <span id="L324" class="LineNr">324 </span>      <span class="Normal">switch</span><span class="Delimiter">(</span>op3 = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L325" class="LineNr">325 </span>      <span class="Comment">// End Three-Byte Opcodes Starting With f2 0f</span>
 <span id="L326" class="LineNr">326 </span>      <span class="Normal">default</span>:
-<span id="L327" class="LineNr">327 </span>        cerr &lt;&lt; <span class="Constant">&quot;unrecognized third opcode after f2 0f: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L432'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>op3<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L328" class="LineNr">328 </span>        <a href='003trace.cc.html#L402'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L327" class="LineNr">327 </span>        cerr &lt;&lt; <span class="Constant">&quot;unrecognized third opcode after f2 0f: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L439'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span>op3<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L328" class="LineNr">328 </span>        <a href='003trace.cc.html#L410'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L329" class="LineNr">329 </span>        exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L330" class="LineNr">330 </span>      <span class="Delimiter">}</span>
 <span id="L331" class="LineNr">331 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L332" class="LineNr">332 </span>    <span class="Normal">default</span>:
-<span id="L333" class="LineNr">333 </span>      cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after f2: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L432'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L334" class="LineNr">334 </span>      <a href='003trace.cc.html#L402'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L333" class="LineNr">333 </span>      cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after f2: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L439'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L334" class="LineNr">334 </span>      <a href='003trace.cc.html#L410'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L335" class="LineNr">335 </span>      exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L336" class="LineNr">336 </span>    <span class="Delimiter">}</span>
 <span id="L337" class="LineNr">337 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -402,20 +403,20 @@ if ('onhashchange' in window) {
 <span id="L342" class="LineNr">342 </span>      <span class="Normal">switch</span><span class="Delimiter">(</span>op3 = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L343" class="LineNr">343 </span>      <span class="Comment">// End Three-Byte Opcodes Starting With f3 0f</span>
 <span id="L344" class="LineNr">344 </span>      <span class="Normal">default</span>:
-<span id="L345" class="LineNr">345 </span>        cerr &lt;&lt; <span class="Constant">&quot;unrecognized third opcode after f3 0f: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L432'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>op3<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L346" class="LineNr">346 </span>        <a href='003trace.cc.html#L402'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L345" class="LineNr">345 </span>        cerr &lt;&lt; <span class="Constant">&quot;unrecognized third opcode after f3 0f: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L439'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span>op3<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L346" class="LineNr">346 </span>        <a href='003trace.cc.html#L410'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L347" class="LineNr">347 </span>        exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L348" class="LineNr">348 </span>      <span class="Delimiter">}</span>
 <span id="L349" class="LineNr">349 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L350" class="LineNr">350 </span>    <span class="Normal">default</span>:
-<span id="L351" class="LineNr">351 </span>      cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after f3: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L432'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L352" class="LineNr">352 </span>      <a href='003trace.cc.html#L402'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L351" class="LineNr">351 </span>      cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after f3: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L439'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L352" class="LineNr">352 </span>      <a href='003trace.cc.html#L410'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L353" class="LineNr">353 </span>      exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L354" class="LineNr">354 </span>    <span class="Delimiter">}</span>
 <span id="L355" class="LineNr">355 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L356" class="LineNr">356 </span>  <span class="Normal">default</span>:
-<span id="L357" class="LineNr">357 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized opcode: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L432'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L358" class="LineNr">358 </span>    <a href='003trace.cc.html#L402'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L357" class="LineNr">357 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized opcode: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L439'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L358" class="LineNr">358 </span>    <a href='003trace.cc.html#L410'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L359" class="LineNr">359 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L360" class="LineNr">360 </span>  <span class="Delimiter">}</span>
 <span id="L361" class="LineNr">361 </span><span class="Delimiter">}</span>
@@ -431,69 +432,76 @@ if ('onhashchange' in window) {
 <span id="L371" class="LineNr">371 </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">&quot;; &quot;</span><span class="Delimiter">;</span>
 <span id="L372" class="LineNr">372 </span>    out &lt;&lt; <span class="Constant">&quot;  &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; std::hex &lt;&lt; std::setw<span class="Delimiter">(</span><span class="Constant">8</span><span class="Delimiter">)</span> &lt;&lt; std::setfill<span class="Delimiter">(</span><span class="Constant">'_'</span><span class="Delimiter">)</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[i]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
 <span id="L373" class="LineNr">373 </span>  <span class="Delimiter">}</span>
-<span id="L374" class="LineNr">374 </span>  out &lt;&lt; <span class="Constant">&quot; -- SF: &quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF: &quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; <a href='010---vm.cc.html#L81'>OF</a>: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">;</span>
-<span id="L375" class="LineNr">375 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; out<span class="Delimiter">.</span>str<span class="Delimiter">()</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L374" class="LineNr">374 </span>  out &lt;&lt; <span class="Constant">&quot; -- SF: &quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; <a href='010---vm.cc.html#L80'>ZF</a>: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L80'>ZF</a> &lt;&lt; <span class="Constant">&quot;; <a href='010---vm.cc.html#L81'>OF</a>: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">;</span>
+<span id="L375" class="LineNr">375 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; out<span class="Delimiter">.</span>str<span class="Delimiter">()</span> &lt;&lt; end<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="Comment">//: start tracking supported opcodes</span>
-<span id="L379" class="LineNr">379 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L380" class="LineNr">380 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string&gt; <span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">;</span>
-<span id="L381" class="LineNr">381 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string&gt; <span class="Special"><a href='010---vm.cc.html#L381'>Name_0f</a></span><span class="Delimiter">;</span>
-<span id="L382" class="LineNr">382 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string&gt; <span class="Special"><a href='010---vm.cc.html#L382'>Name_f3</a></span><span class="Delimiter">;</span>
-<span id="L383" class="LineNr">383 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string&gt; <span class="Special"><a href='010---vm.cc.html#L383'>Name_f3_0f</a></span><span class="Delimiter">;</span>
-<span id="L384" class="LineNr">384 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
-<span id="L385" class="LineNr">385 </span><a href='010---vm.cc.html#L387'>init_op_names</a><span class="Delimiter">();</span>
-<span id="L386" class="LineNr">386 </span><span class="Delimiter">:(code)</span>
-<span id="L387" class="LineNr">387 </span><span class="Normal">void</span> <a href='010---vm.cc.html#L387'>init_op_names</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L388" class="LineNr">388 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;f4&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;halt (hlt)&quot;</span><span class="Delimiter">);</span>
-<span id="L389" class="LineNr">389 </span>  <span class="Comment">// End Initialize Op Names</span>
-<span id="L390" class="LineNr">390 </span><span class="Delimiter">}</span>
-<span id="L391" class="LineNr">391 </span>
-<span id="L392" class="LineNr">392 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Special-cases(key)&quot;)</span>
-<span id="L393" class="LineNr">393 </span><span class="Normal">if</span> <span class="Delimiter">(</span>key == <span class="Constant">&quot;opcodes&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L394" class="LineNr">394 </span>  cerr &lt;&lt; <span class="Constant">&quot;Opcodes currently supported by SubX:\n&quot;</span><span class="Delimiter">;</span>
-<span id="L395" class="LineNr">395 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> string&gt;::iterator p = <span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L396" class="LineNr">396 </span>    cerr &lt;&lt; <span class="Constant">&quot;  &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>second &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L397" class="LineNr">397 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> string&gt;::iterator p = <span class="Special"><a href='010---vm.cc.html#L381'>Name_0f</a></span><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special"><a href='010---vm.cc.html#L381'>Name_0f</a></span><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L398" class="LineNr">398 </span>    cerr &lt;&lt; <span class="Constant">&quot;  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="L399" class="LineNr">399 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> string&gt;::iterator p = <span class="Special"><a href='010---vm.cc.html#L382'>Name_f3</a></span><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special"><a href='010---vm.cc.html#L382'>Name_f3</a></span><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L400" class="LineNr">400 </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="L401" class="LineNr">401 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> string&gt;::iterator p = <span class="Special"><a href='010---vm.cc.html#L383'>Name_f3_0f</a></span><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special"><a href='010---vm.cc.html#L383'>Name_f3_0f</a></span><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L402" class="LineNr">402 </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="L403" class="LineNr">403 </span>  cerr &lt;&lt; <span class="Constant">&quot;Run `subx help instructions` for details on <a href='011run.cc.html#L114'>words</a> like 'r32' and 'disp8'.\n&quot;</span>
-<span id="L404" class="LineNr">404 </span>          <span class="Constant">&quot;For complete details on these instructions, consult the IA-32 manual (volume 2).\n&quot;</span>
-<span id="L405" class="LineNr">405 </span>          <span class="Constant">&quot;There's various versions of it online, such as <a href="https://c9x.me/x86.">https://c9x.me/x86.</a>\n&quot;</span>
-<span id="L406" class="LineNr">406 </span>          <span class="Constant">&quot;The mnemonics in brackets will help you locate each instruction.\n&quot;</span><span class="Delimiter">;</span>
-<span id="L407" class="LineNr">407 </span>  <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L408" class="LineNr">408 </span><span class="Delimiter">}</span>
-<span id="L409" class="LineNr">409 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Contents&quot;)</span>
-<span id="L410" class="LineNr">410 </span>cerr &lt;&lt; <span class="Constant">&quot;  opcodes\n&quot;</span><span class="Delimiter">;</span>
-<span id="L411" class="LineNr">411 </span>
-<span id="L412" class="LineNr">412 </span><span class="Comment">//: Helpers for managing trace depths</span>
-<span id="L413" class="LineNr">413 </span><span class="Comment">//:</span>
-<span id="L414" class="LineNr">414 </span><span class="Comment">//: We're going to use trace depths primarily to segment code running at</span>
-<span id="L415" class="LineNr">415 </span><span class="Comment">//: different frames of the call stack. This will make it easy for the trace</span>
-<span id="L416" class="LineNr">416 </span><span class="Comment">//: browser to collapse over entire calls.</span>
-<span id="L417" class="LineNr">417 </span><span class="Comment">//:</span>
-<span id="L418" class="LineNr">418 </span><span class="Comment">//: Errors will be at depth 0.</span>
-<span id="L419" class="LineNr">419 </span><span class="Comment">//: Warnings will be at depth 1.</span>
-<span id="L420" class="LineNr">420 </span><span class="Comment">//: SubX instructions will occupy depth 2 and up to Max_depth, organized by</span>
-<span id="L421" class="LineNr">421 </span><span class="Comment">//: stack frames. Each instruction's internal details will be one level deeper</span>
-<span id="L422" class="LineNr">422 </span><span class="Comment">//: than its 'main' depth. So 'call' instruction details will be at the same</span>
-<span id="L423" class="LineNr">423 </span><span class="Comment">//: depth as the instructions of the function it calls.</span>
-<span id="L424" class="LineNr">424 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L425" class="LineNr">425 </span><span class="Normal">extern</span> <span class="Normal">const</span> <span class="Normal">int</span> <span class="Special"><a href='010---vm.cc.html#L425'>Initial_callstack_depth</a></span> = <span class="Constant">2</span><span class="Delimiter">;</span>
-<span id="L426" class="LineNr">426 </span><span class="Normal">int</span> <span class="Special">Callstack_depth</span> = <span class="Special"><a href='010---vm.cc.html#L425'>Initial_callstack_depth</a></span><span class="Delimiter">;</span>
-<span id="L427" class="LineNr">427 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
-<span id="L428" class="LineNr">428 </span><span class="Special">Callstack_depth</span> = <span class="Special"><a href='010---vm.cc.html#L425'>Initial_callstack_depth</a></span><span class="Delimiter">;</span>
-<span id="L429" class="LineNr">429 </span>
-<span id="L430" class="LineNr">430 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L431" class="LineNr">431 </span><span class="Comment">#include &lt;iomanip&gt;</span>
-<span id="L432" class="LineNr">432 </span><span class="Comment">#define HEXBYTE  std::hex &lt;&lt; std::setw(2) &lt;&lt; std::setfill('0')</span>
-<span id="L433" class="LineNr">433 </span><span class="Comment">#define HEXWORD  std::hex &lt;&lt; std::setw(8) &lt;&lt; std::setfill('0')</span>
-<span id="L434" class="LineNr">434 </span><span class="Comment">// ugly that iostream doesn't print uint8_t as an integer</span>
-<span id="L435" class="LineNr">435 </span><span class="Comment">#define NUM(X) static_cast&lt;int&gt;(X)</span>
-<span id="L436" class="LineNr">436 </span><span class="Comment">#include &lt;stdint.h&gt;</span>
+<span id="L378" class="LineNr">378 </span><span class="Comment">// debugging info from a later layer</span>
+<span id="L379" class="LineNr">379 </span>string <a href='010---vm.cc.html#L379'>call_label</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L380" class="LineNr">380 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op != <span class="Constant">0xe8</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L381" class="LineNr">381 </span>  <span class="Comment">// End Trace Call Instruction</span>
+<span id="L382" class="LineNr">382 </span>  <span class="Identifier">return</span> <span class="Constant">&quot;/call&quot;</span><span class="Delimiter">;</span>
+<span id="L383" class="LineNr">383 </span><span class="Delimiter">}</span>
+<span id="L384" class="LineNr">384 </span>
+<span id="L385" class="LineNr">385 </span><span class="Comment">//: start tracking supported opcodes</span>
+<span id="L386" class="LineNr">386 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L387" class="LineNr">387 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string&gt; <span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">;</span>
+<span id="L388" class="LineNr">388 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string&gt; <span class="Special"><a href='010---vm.cc.html#L388'>Name_0f</a></span><span class="Delimiter">;</span>
+<span id="L389" class="LineNr">389 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string&gt; <span class="Special"><a href='010---vm.cc.html#L389'>Name_f3</a></span><span class="Delimiter">;</span>
+<span id="L390" class="LineNr">390 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string&gt; <span class="Special"><a href='010---vm.cc.html#L390'>Name_f3_0f</a></span><span class="Delimiter">;</span>
+<span id="L391" class="LineNr">391 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
+<span id="L392" class="LineNr">392 </span><a href='010---vm.cc.html#L394'>init_op_names</a><span class="Delimiter">();</span>
+<span id="L393" class="LineNr">393 </span><span class="Delimiter">:(code)</span>
+<span id="L394" class="LineNr">394 </span><span class="Normal">void</span> <a href='010---vm.cc.html#L394'>init_op_names</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L395" class="LineNr">395 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;f4&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;halt (hlt)&quot;</span><span class="Delimiter">);</span>
+<span id="L396" class="LineNr">396 </span>  <span class="Comment">// End Initialize Op Names</span>
+<span id="L397" class="LineNr">397 </span><span class="Delimiter">}</span>
+<span id="L398" class="LineNr">398 </span>
+<span id="L399" class="LineNr">399 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Special-cases(key)&quot;)</span>
+<span id="L400" class="LineNr">400 </span><span class="Normal">if</span> <span class="Delimiter">(</span>key == <span class="Constant">&quot;opcodes&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L401" class="LineNr">401 </span>  cerr &lt;&lt; <span class="Constant">&quot;Opcodes currently supported by SubX:\n&quot;</span><span class="Delimiter">;</span>
+<span id="L402" class="LineNr">402 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> string&gt;::iterator p = <span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L403" class="LineNr">403 </span>    cerr &lt;&lt; <span class="Constant">&quot;  &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>second &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L404" class="LineNr">404 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> string&gt;::iterator p = <span class="Special"><a href='010---vm.cc.html#L388'>Name_0f</a></span><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special"><a href='010---vm.cc.html#L388'>Name_0f</a></span><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L405" class="LineNr">405 </span>    cerr &lt;&lt; <span class="Constant">&quot;  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="L406" class="LineNr">406 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> string&gt;::iterator p = <span class="Special"><a href='010---vm.cc.html#L389'>Name_f3</a></span><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special"><a href='010---vm.cc.html#L389'>Name_f3</a></span><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L407" class="LineNr">407 </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="L408" class="LineNr">408 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> string&gt;::iterator p = <span class="Special"><a href='010---vm.cc.html#L390'>Name_f3_0f</a></span><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special"><a href='010---vm.cc.html#L390'>Name_f3_0f</a></span><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L409" class="LineNr">409 </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="L410" class="LineNr">410 </span>  cerr &lt;&lt; <span class="Constant">&quot;Run `subx help instructions` for details on <a href='011run.cc.html#L121'>words</a> like 'r32' and 'disp8'.\n&quot;</span>
+<span id="L411" class="LineNr">411 </span>          <span class="Constant">&quot;For complete details on these instructions, consult the IA-32 manual (volume 2).\n&quot;</span>
+<span id="L412" class="LineNr">412 </span>          <span class="Constant">&quot;There's various versions of it online, such as <a href="https://c9x.me/x86.">https://c9x.me/x86.</a>\n&quot;</span>
+<span id="L413" class="LineNr">413 </span>          <span class="Constant">&quot;The mnemonics in brackets will help you locate each instruction.\n&quot;</span><span class="Delimiter">;</span>
+<span id="L414" class="LineNr">414 </span>  <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L415" class="LineNr">415 </span><span class="Delimiter">}</span>
+<span id="L416" class="LineNr">416 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Contents&quot;)</span>
+<span id="L417" class="LineNr">417 </span>cerr &lt;&lt; <span class="Constant">&quot;  opcodes\n&quot;</span><span class="Delimiter">;</span>
+<span id="L418" class="LineNr">418 </span>
+<span id="L419" class="LineNr">419 </span><span class="Comment">//: Helpers for managing trace depths</span>
+<span id="L420" class="LineNr">420 </span><span class="Comment">//:</span>
+<span id="L421" class="LineNr">421 </span><span class="Comment">//: We're going to use trace depths primarily to segment code running at</span>
+<span id="L422" class="LineNr">422 </span><span class="Comment">//: different frames of the call stack. This will make it easy for the trace</span>
+<span id="L423" class="LineNr">423 </span><span class="Comment">//: browser to collapse over entire calls.</span>
+<span id="L424" class="LineNr">424 </span><span class="Comment">//:</span>
+<span id="L425" class="LineNr">425 </span><span class="Comment">//: Errors will be at depth 0.</span>
+<span id="L426" class="LineNr">426 </span><span class="Comment">//: Warnings will be at depth 1.</span>
+<span id="L427" class="LineNr">427 </span><span class="Comment">//: SubX instructions will occupy depth 2 and up to Max_depth, organized by</span>
+<span id="L428" class="LineNr">428 </span><span class="Comment">//: stack frames. Each instruction's internal details will be one level deeper</span>
+<span id="L429" class="LineNr">429 </span><span class="Comment">//: than its 'main' depth. So 'call' instruction details will be at the same</span>
+<span id="L430" class="LineNr">430 </span><span class="Comment">//: depth as the instructions of the function it calls.</span>
+<span id="L431" class="LineNr">431 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L432" class="LineNr">432 </span><span class="Normal">extern</span> <span class="Normal">const</span> <span class="Normal">int</span> <span class="Special"><a href='010---vm.cc.html#L432'>Initial_callstack_depth</a></span> = <span class="Constant">2</span><span class="Delimiter">;</span>
+<span id="L433" class="LineNr">433 </span><span class="Normal">int</span> <span class="Special">Callstack_depth</span> = <span class="Special"><a href='010---vm.cc.html#L432'>Initial_callstack_depth</a></span><span class="Delimiter">;</span>
+<span id="L434" class="LineNr">434 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
+<span id="L435" class="LineNr">435 </span><span class="Special">Callstack_depth</span> = <span class="Special"><a href='010---vm.cc.html#L432'>Initial_callstack_depth</a></span><span class="Delimiter">;</span>
+<span id="L436" class="LineNr">436 </span>
+<span id="L437" class="LineNr">437 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L438" class="LineNr">438 </span><span class="PreProc">#include </span><span class="Constant">&lt;iomanip&gt;</span>
+<span id="L439" class="LineNr">439 </span><span class="PreProc">#define HEXBYTE  std::hex &lt;&lt; std::setw(</span><span class="Constant">2</span><span class="PreProc">) &lt;&lt; std::setfill(</span><span class="Constant">'0'</span><span class="PreProc">)</span>
+<span id="L440" class="LineNr">440 </span><span class="PreProc">#define HEXWORD  std::hex &lt;&lt; std::setw(</span><span class="Constant">8</span><span class="PreProc">) &lt;&lt; std::setfill(</span><span class="Constant">'0'</span><span class="PreProc">)</span>
+<span id="L441" class="LineNr">441 </span><span class="Comment">// ugly that iostream doesn't print uint8_t as an integer</span>
+<span id="L442" class="LineNr">442 </span><span class="PreProc">#define NUM(</span><span class="Special">X</span><span class="PreProc">) </span><span class="Normal">static_cast</span><span class="PreProc">&lt;</span><span class="Normal">int</span><span class="PreProc">&gt;(</span><span class="Special">X</span><span class="PreProc">)</span>
+<span id="L443" class="LineNr">443 </span><span class="PreProc">#include </span><span class="Constant">&lt;stdint.h&gt;</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/011run.cc.html b/html/subx/011run.cc.html
index ee3a05f7..5affa67f 100644
--- a/html/subx/011run.cc.html
+++ b/html/subx/011run.cc.html
@@ -15,16 +15,14 @@ body { font-size:12pt; font-family: monospace; color: #000000; background-color:
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
 .cSpecial { color: #008000; }
-.traceContains { color: #005f00; }
 .LineNr { }
 .Constant { color: #008787; }
-.SalientComment { color: #0000af; }
 .Delimiter { color: #c000c0; }
 .Special { color: #d70000; }
 .Identifier { color: #af5f00; }
 .Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 .Comment { color: #005faf; }
-.PreProc { color: #c000c0; }
+.SalientComment { color: #0000af; }
 -->
 </style>
 
@@ -67,20 +65,20 @@ if ('onhashchange' in window) {
 <span id="L5" class="LineNr">  5 </span>
 <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#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><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#L96'>segments</a>, each segment in turn consisting of lines.\n&quot;</span>
-<span id="L9" class="LineNr">  9 </span>  <span class="Constant">&quot;Line-endings are significant; each <a href='011run.cc.html#L113'>line</a> should contain a single\n&quot;</span>
+<span id="L8" class="LineNr">  8 </span>  <span class="Constant">&quot;SubX programs consist of <a href='011run.cc.html#L103'>segments</a>, each segment in turn consisting of lines.\n&quot;</span>
+<span id="L9" class="LineNr">  9 </span>  <span class="Constant">&quot;Line-endings are significant; each <a href='011run.cc.html#L120'>line</a> should contain a single\n&quot;</span>
 <span id="L10" class="LineNr"> 10 </span>  <span class="Constant">&quot;instruction, macro or directive.\n&quot;</span>
 <span id="L11" class="LineNr"> 11 </span>  <span class="Constant">&quot;\n&quot;</span>
 <span id="L12" class="LineNr"> 12 </span>  <span class="Constant">&quot;Comments start with the '#' character. It should be at the start of a word\n&quot;</span>
-<span id="L13" class="LineNr"> 13 </span>  <span class="Constant">&quot;(start of <a href='011run.cc.html#L113'>line</a>, or following a space).\n&quot;</span>
+<span id="L13" class="LineNr"> 13 </span>  <span class="Constant">&quot;(start of <a href='011run.cc.html#L120'>line</a>, or following a space).\n&quot;</span>
 <span id="L14" class="LineNr"> 14 </span>  <span class="Constant">&quot;\n&quot;</span>
-<span id="L15" class="LineNr"> 15 </span>  <span class="Constant">&quot;Each segment starts with a header <a href='011run.cc.html#L113'>line</a>: a '==' delimiter followed by the name of\n&quot;</span>
+<span id="L15" class="LineNr"> 15 </span>  <span class="Constant">&quot;Each segment starts with a header <a href='011run.cc.html#L120'>line</a>: a '==' delimiter followed by the name of\n&quot;</span>
 <span id="L16" class="LineNr"> 16 </span>  <span class="Constant">&quot;the segment.\n&quot;</span>
 <span id="L17" class="LineNr"> 17 </span>  <span class="Constant">&quot;\n&quot;</span>
-<span id="L18" class="LineNr"> 18 </span>  <span class="Constant">&quot;The first segment contains <a href='031check_operands.cc.html#L11'>code</a> and should be called 'code'.\n&quot;</span>
+<span id="L18" class="LineNr"> 18 </span>  <span class="Constant">&quot;The first segment contains code and should be called 'code'.\n&quot;</span>
 <span id="L19" class="LineNr"> 19 </span>  <span class="Constant">&quot;The second segment should be called 'data'.\n&quot;</span>
-<span id="L20" class="LineNr"> 20 </span>  <span class="Constant">&quot;The resulting binary starts running from the start of the <a href='031check_operands.cc.html#L11'>code</a> segment by default.\n&quot;</span>
-<span id="L21" class="LineNr"> 21 </span>  <span class="Constant">&quot;To start elsewhere in the <a href='031check_operands.cc.html#L11'>code</a> segment, define a special label called 'Entry'.\n&quot;</span>
+<span id="L20" class="LineNr"> 20 </span>  <span class="Constant">&quot;The resulting binary starts running from the start of the code segment by default.\n&quot;</span>
+<span id="L21" class="LineNr"> 21 </span>  <span class="Constant">&quot;To start elsewhere in the code segment, define a special label called 'Entry'.\n&quot;</span>
 <span id="L22" class="LineNr"> 22 </span>  <span class="Constant">&quot;\n&quot;</span>
 <span id="L23" class="LineNr"> 23 </span>  <span class="Constant">&quot;Segments with the same name get merged together. This rule helps keep functions and\n&quot;</span>
 <span id="L24" class="LineNr"> 24 </span>  <span class="Constant">&quot;their data close together in .subx files.\n&quot;</span>
@@ -90,360 +88,387 @@ if ('onhashchange' in window) {
 <span id="L28" class="LineNr"> 28 </span>  <span class="Constant">&quot;at runtime, but can be handy when rewriting macros.\n&quot;</span>
 <span id="L29" class="LineNr"> 29 </span>  <span class="Constant">&quot;\n&quot;</span>
 <span id="L30" class="LineNr"> 30 </span>  <span class="Constant">&quot;Check out the examples in the examples/ directory.\n&quot;</span>
-<span id="L31" class="LineNr"> 31 </span>  <span class="Constant">&quot;Programming in machine <a href='031check_operands.cc.html#L11'>code</a> can be annoying, but let's see if we can make\n&quot;</span>
+<span id="L31" class="LineNr"> 31 </span>  <span class="Constant">&quot;Programming in machine code can be annoying, but let's see if we can make\n&quot;</span>
 <span id="L32" class="LineNr"> 32 </span>  <span class="Constant">&quot;it nice enough to be able to write a compiler in it.\n&quot;</span>
 <span id="L33" class="LineNr"> 33 </span><span class="Delimiter">);</span>
 <span id="L34" class="LineNr"> 34 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Contents&quot;)</span>
 <span id="L35" class="LineNr"> 35 </span>cerr &lt;&lt; <span class="Constant">&quot;  syntax\n&quot;</span><span class="Delimiter">;</span>
 <span id="L36" class="LineNr"> 36 </span>
-<span id="L37" class="LineNr"> 37 </span><span class="Delimiter">:(scenario add_imm32_to_eax)</span>
-<span id="L38" class="LineNr"> 38 </span><span class="Comment"># At the lowest level, SubX programs are a series of hex bytes, each</span>
-<span id="L39" class="LineNr"> 39 </span><span class="Comment"># (variable-length) instruction on one line.</span>
-<span id="L40" class="LineNr"> 40 </span><span class="Comment">#</span>
-<span id="L41" class="LineNr"> 41 </span><span class="Comment"># Later we'll make things nicer using macros. But you'll always be able to</span>
-<span id="L42" class="LineNr"> 42 </span><span class="Comment"># insert hex bytes out of instructions.</span>
-<span id="L43" class="LineNr"> 43 </span><span class="Comment">#</span>
-<span id="L44" class="LineNr"> 44 </span><span class="Comment"># As you can see, comments start with '#' and are ignored.</span>
-<span id="L45" class="LineNr"> 45 </span>
-<span id="L46" class="LineNr"> 46 </span><span class="Comment"># Segment headers start with '==', specifying the hex address where they</span>
-<span id="L47" class="LineNr"> 47 </span><span class="Comment"># begin. There's usually one code segment and one data segment. We assume the</span>
-<span id="L48" class="LineNr"> 48 </span><span class="Comment"># code segment always comes first. Later when we emit ELF binaries we'll add</span>
-<span id="L49" class="LineNr"> 49 </span><span class="Comment"># directives for the operating system to ensure that the code segment can't be</span>
-<span id="L50" class="LineNr"> 50 </span><span class="Comment"># written to, and the data segment can't be executed as code.</span>
-<span id="L51" class="LineNr"> 51 </span>== <span class="Constant">0x1</span>
-<span id="L52" class="LineNr"> 52 </span>
-<span id="L53" class="LineNr"> 53 </span><span class="Comment"># We don't show it here, but all lines can have metadata after a ':'.</span>
-<span id="L54" class="LineNr"> 54 </span><span class="Comment"># All words can have metadata after a '/'. No spaces allowed in word metadata, of course.</span>
-<span id="L55" class="LineNr"> 55 </span><span class="Comment"># Metadata doesn't directly form instructions, but some macros may look at it.</span>
-<span id="L56" class="LineNr"> 56 </span><span class="Comment"># Unrecognized metadata never causes errors, so you can also use it for</span>
-<span id="L57" class="LineNr"> 57 </span><span class="Comment"># documentation.</span>
-<span id="L58" class="LineNr"> 58 </span>
-<span id="L59" class="LineNr"> 59 </span><span class="Comment"># Within the code segment, x86 instructions consist of the following parts (see cheatsheet.pdf):</span>
-<span id="L60" class="LineNr"> 60 </span><span class="Comment">#   opcode        ModR/M                    SIB                   displacement    immediate</span>
-<span id="L61" class="LineNr"> 61 </span><span class="Comment">#   instruction   mod, reg, Reg/Mem bits    scale, index, base</span>
-<span id="L62" class="LineNr"> 62 </span><span class="Comment">#   1-3 bytes     0/1 byte                  0/1 byte              0/1/2/4 bytes   0/1/2/4 bytes</span>
-<span id="L63" class="LineNr"> 63 </span>    <span class="PreProc">0</span><span class="Constant">5</span>            <span class="Delimiter">.</span>                         <span class="Delimiter">.</span>                     <span class="Delimiter">.</span>               0a 0b 0c 0d  <span class="Comment"># add 0x0d0c0b0a to EAX</span>
-<span id="L64" class="LineNr"> 64 </span><span class="Comment"># (The single periods are just to help the eye track long gaps between</span>
-<span id="L65" class="LineNr"> 65 </span><span class="Comment"># columns, and are otherwise ignored.)</span>
-<span id="L66" class="LineNr"> 66 </span>
-<span id="L67" class="LineNr"> 67 </span><span class="Comment"># This program, when run, causes the following events in the trace:</span>
-<span id="L68" class="LineNr"> 68 </span><span class="traceContains">+load: 0x00000001 -&gt; 05</span>
-<span id="L69" class="LineNr"> 69 </span><span class="traceContains">+load: 0x00000002 -&gt; 0a</span>
-<span id="L70" class="LineNr"> 70 </span><span class="traceContains">+load: 0x00000003 -&gt; 0b</span>
-<span id="L71" class="LineNr"> 71 </span><span class="traceContains">+load: 0x00000004 -&gt; 0c</span>
-<span id="L72" class="LineNr"> 72 </span><span class="traceContains">+load: 0x00000005 -&gt; 0d</span>
-<span id="L73" class="LineNr"> 73 </span><span class="traceContains">+run: add <a href='037heap.cc.html#L23'>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: storing 0x0d0c0b0a</span>
-<span id="L75" class="LineNr"> 75 </span>
-<span id="L76" class="LineNr"> 76 </span><span class="Delimiter">:(code)</span>
-<span id="L77" class="LineNr"> 77 </span><span class="Comment">// top-level helper for scenarios: parse the input, transform any macros, load</span>
-<span id="L78" class="LineNr"> 78 </span><span class="Comment">// the final hex bytes into memory, run it</span>
-<span id="L79" class="LineNr"> 79 </span><span class="Normal">void</span> <a href='011run.cc.html#L79'>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="L80" class="LineNr"> 80 </span>  <a href='011run.cc.html#L95'>program</a> p<span class="Delimiter">;</span>
-<span id="L81" class="LineNr"> 81 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
-<span id="L82" class="LineNr"> 82 </span>  parse<span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
-<span id="L83" class="LineNr"> 83 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L230'>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="L84" class="LineNr"> 84 </span>  <a href='011run.cc.html#L227'>transform</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
-<span id="L85" class="LineNr"> 85 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L230'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L86" class="LineNr"> 86 </span>  <a href='011run.cc.html#L234'>load</a><span class="Delimiter">(</span>p<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#L230'>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">while</span> <span class="Delimiter">(</span>EIP &lt; <span class="Special"><a href='010---vm.cc.html#L194'>End_of_program</a></span><span class="Delimiter">)</span>
-<span id="L89" class="LineNr"> 89 </span>    <a href='010---vm.cc.html#L296'>run_one_instruction</a><span class="Delimiter">();</span>
-<span id="L90" class="LineNr"> 90 </span><span class="Delimiter">}</span>
-<span id="L91" class="LineNr"> 91 </span>
-<span id="L92" class="LineNr"> 92 </span><span class="SalientComment">//:: core data structures</span>
-<span id="L93" class="LineNr"> 93 </span>
-<span id="L94" class="LineNr"> 94 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L95" class="LineNr"> 95 </span><span class="Normal">struct</span> <a href='011run.cc.html#L95'>program</a> <span class="Delimiter">{</span>
-<span id="L96" class="LineNr"> 96 </span>  vector&lt;segment&gt; <a href='011run.cc.html#L96'>segments</a><span class="Delimiter">;</span>
-<span id="L97" class="LineNr"> 97 </span>  <span class="Comment">// random ideas for other things we may eventually need</span>
-<span id="L98" class="LineNr"> 98 </span>  <span class="Comment">//map&lt;name, address&gt; globals;</span>
-<span id="L99" class="LineNr"> 99 </span>  <span class="Comment">//vector&lt;recipe&gt; recipes;</span>
-<span id="L100" class="LineNr">100 </span>  <span class="Comment">//map&lt;string, type_info&gt; types;</span>
-<span id="L101" class="LineNr">101 </span><span class="Delimiter">};</span>
-<span id="L102" class="LineNr">102 </span><span class="Delimiter">:(before &quot;struct program&quot;)</span>
-<span id="L103" class="LineNr">103 </span><span class="Normal">struct</span> segment <span class="Delimiter">{</span>
-<span id="L104" class="LineNr">104 </span>  <span class="Normal">uint32_t</span> start<span class="Delimiter">;</span>
-<span id="L105" class="LineNr">105 </span>  vector&lt;line&gt; <a href='011run.cc.html#L105'>lines</a><span class="Delimiter">;</span>
-<span id="L106" class="LineNr">106 </span>  <span class="Comment">// End segment Fields</span>
-<span id="L107" class="LineNr">107 </span>  segment<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L108" class="LineNr">108 </span>    start = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L109" class="LineNr">109 </span>    <span class="Comment">// End segment Constructor</span>
-<span id="L110" class="LineNr">110 </span>  <span class="Delimiter">}</span>
-<span id="L111" class="LineNr">111 </span><span class="Delimiter">};</span>
-<span id="L112" class="LineNr">112 </span><span class="Delimiter">:(before &quot;struct segment&quot;)</span>
-<span id="L113" class="LineNr">113 </span><span class="Normal">struct</span> <a href='011run.cc.html#L113'>line</a> <span class="Delimiter">{</span>
-<span id="L114" class="LineNr">114 </span>  vector&lt;word&gt; <a href='011run.cc.html#L114'>words</a><span class="Delimiter">;</span>
-<span id="L115" class="LineNr">115 </span>  vector&lt;string&gt; metadata<span class="Delimiter">;</span>
-<span id="L116" class="LineNr">116 </span>  string original<span class="Delimiter">;</span>
-<span id="L117" class="LineNr">117 </span><span class="Delimiter">};</span>
-<span id="L118" class="LineNr">118 </span><span class="Delimiter">:(before &quot;struct line&quot;)</span>
-<span id="L119" class="LineNr">119 </span><span class="Normal">struct</span> <a href='011run.cc.html#L119'>word</a> <span class="Delimiter">{</span>
-<span id="L120" class="LineNr">120 </span>  string original<span class="Delimiter">;</span>
-<span id="L121" class="LineNr">121 </span>  string data<span class="Delimiter">;</span>
+<span id="L37" class="LineNr"> 37 </span><span class="Delimiter">:(code)</span>
+<span id="L38" class="LineNr"> 38 </span><span class="Normal">void</span> <a href='011run.cc.html#L38'>test_add_imm32_to_eax</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L39" class="LineNr"> 39 </span>  <span class="Comment">// At the lowest level, SubX programs are a series of hex bytes, each</span>
+<span id="L40" class="LineNr"> 40 </span>  <span class="Comment">// (variable-length) instruction on one line.</span>
+<span id="L41" class="LineNr"> 41 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L42" class="LineNr"> 42 </span>      <span class="Comment">// Comments start with '#' and are ignored.</span>
+<span id="L43" class="LineNr"> 43 </span>      <span class="Constant">&quot;# comment\n&quot;</span>
+<span id="L44" class="LineNr"> 44 </span>      <span class="Comment">// Segment headers start with '==' and a name or starting hex address.</span>
+<span id="L45" class="LineNr"> 45 </span>      <span class="Comment">// There's usually one code and one data segment. The code segment</span>
+<span id="L46" class="LineNr"> 46 </span>      <span class="Comment">// always comes first.</span>
+<span id="L47" class="LineNr"> 47 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L48" class="LineNr"> 48 </span>
+<span id="L49" class="LineNr"> 49 </span>      <span class="Comment">// After the header, each segment consists of lines, and each line</span>
+<span id="L50" class="LineNr"> 50 </span>      <span class="Comment">// consists of words separated by whitespace.</span>
+<span id="L51" class="LineNr"> 51 </span>      <span class="Comment">//</span>
+<span id="L52" class="LineNr"> 52 </span>      <span class="Comment">// All words can have metadata after a '/'. No spaces allowed in</span>
+<span id="L53" class="LineNr"> 53 </span>      <span class="Comment">// metadata, of course.</span>
+<span id="L54" class="LineNr"> 54 </span>      <span class="Comment">// Unrecognized metadata never causes errors, so you can use it for</span>
+<span id="L55" class="LineNr"> 55 </span>      <span class="Comment">// documentation.</span>
+<span id="L56" class="LineNr"> 56 </span>      <span class="Comment">//</span>
+<span id="L57" class="LineNr"> 57 </span>      <span class="Comment">// Within the code segment in particular, x86 instructions consist of</span>
+<span id="L58" class="LineNr"> 58 </span>      <span class="Comment">// some number of the following parts and sub-parts (see the Readme and</span>
+<span id="L59" class="LineNr"> 59 </span>      <span class="Comment">// cheatsheet.pdf for details):</span>
+<span id="L60" class="LineNr"> 60 </span>      <span class="Comment">//   opcodes: 1-3 bytes</span>
+<span id="L61" class="LineNr"> 61 </span>      <span class="Comment">//   ModR/M byte</span>
+<span id="L62" class="LineNr"> 62 </span>      <span class="Comment">//   SIB byte</span>
+<span id="L63" class="LineNr"> 63 </span>      <span class="Comment">//   displacement: 0/1/2/4 bytes</span>
+<span id="L64" class="LineNr"> 64 </span>      <span class="Comment">//   immediate: 0/1/2/4 bytes</span>
+<span id="L65" class="LineNr"> 65 </span>      <span class="Comment">// opcode        ModR/M                    SIB                   displacement    immediate</span>
+<span id="L66" class="LineNr"> 66 </span>      <span class="Comment">// instruction   mod, reg, Reg/Mem bits    scale, index, base</span>
+<span id="L67" class="LineNr"> 67 </span>      <span class="Comment">// 1-3 bytes     0/1 byte                  0/1 byte              0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L68" class="LineNr"> 68 </span>      <span class="Constant">&quot;  05            .                         .                     .               0a 0b 0c 0d\n&quot;</span>  <span class="Comment">// add 0x0d0c0b0a to EAX</span>
+<span id="L69" class="LineNr"> 69 </span>      <span class="Comment">// The periods are just to help the eye track long gaps between columns,</span>
+<span id="L70" class="LineNr"> 70 </span>      <span class="Comment">// and are otherwise ignored.</span>
+<span id="L71" class="LineNr"> 71 </span>  <span class="Delimiter">);</span>
+<span id="L72" class="LineNr"> 72 </span>  <span class="Comment">// This program, when run, causes the following events in the trace:</span>
+<span id="L73" class="LineNr"> 73 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L74" class="LineNr"> 74 </span>      <span class="Constant">&quot;load: 0x00000001 -&gt; 05\n&quot;</span>
+<span id="L75" class="LineNr"> 75 </span>      <span class="Constant">&quot;load: 0x00000002 -&gt; 0a\n&quot;</span>
+<span id="L76" class="LineNr"> 76 </span>      <span class="Constant">&quot;load: 0x00000003 -&gt; 0b\n&quot;</span>
+<span id="L77" class="LineNr"> 77 </span>      <span class="Constant">&quot;load: 0x00000004 -&gt; 0c\n&quot;</span>
+<span id="L78" class="LineNr"> 78 </span>      <span class="Constant">&quot;load: 0x00000005 -&gt; 0d\n&quot;</span>
+<span id="L79" class="LineNr"> 79 </span>      <span class="Constant">&quot;run: add <a href='037heap.cc.html#L23'>imm32</a> 0x0d0c0b0a to <a href='010---vm.cc.html#L23'>reg</a> EAX\n&quot;</span>
+<span id="L80" class="LineNr"> 80 </span>      <span class="Constant">&quot;run: storing 0x0d0c0b0a\n&quot;</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>
+<span id="L84" class="LineNr"> 84 </span><span class="Comment">// top-level helper for scenarios: parse the input, transform any macros, load</span>
+<span id="L85" class="LineNr"> 85 </span><span class="Comment">// the final hex bytes into memory, run it</span>
+<span id="L86" class="LineNr"> 86 </span><span class="Normal">void</span> <a href='011run.cc.html#L86'>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="L87" class="LineNr"> 87 </span>  <a href='011run.cc.html#L102'>program</a> p<span class="Delimiter">;</span>
+<span id="L88" class="LineNr"> 88 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
+<span id="L89" class="LineNr"> 89 </span>  parse<span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
+<span id="L90" class="LineNr"> 90 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L238'>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="L91" class="LineNr"> 91 </span>  transform<span class="Delimiter">(</span>p<span class="Delimiter">);</span>
+<span id="L92" class="LineNr"> 92 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L238'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L93" class="LineNr"> 93 </span>  <a href='011run.cc.html#L245'>load</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
+<span id="L94" class="LineNr"> 94 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L238'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L95" class="LineNr"> 95 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>EIP &lt; <span class="Special"><a href='010---vm.cc.html#L194'>End_of_program</a></span><span class="Delimiter">)</span>
+<span id="L96" class="LineNr"> 96 </span>    <a href='010---vm.cc.html#L296'>run_one_instruction</a><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="SalientComment">//:: core data structures</span>
+<span id="L100" class="LineNr">100 </span>
+<span id="L101" class="LineNr">101 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L102" class="LineNr">102 </span><span class="Normal">struct</span> <a href='011run.cc.html#L102'>program</a> <span class="Delimiter">{</span>
+<span id="L103" class="LineNr">103 </span>  vector&lt;segment&gt; <a href='011run.cc.html#L103'>segments</a><span class="Delimiter">;</span>
+<span id="L104" class="LineNr">104 </span>  <span class="Comment">// random ideas for other things we may eventually need</span>
+<span id="L105" class="LineNr">105 </span>  <span class="Comment">//map&lt;name, address&gt; globals;</span>
+<span id="L106" class="LineNr">106 </span>  <span class="Comment">//vector&lt;recipe&gt; recipes;</span>
+<span id="L107" class="LineNr">107 </span>  <span class="Comment">//map&lt;string, type_info&gt; types;</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 program&quot;)</span>
+<span id="L110" class="LineNr">110 </span><span class="Normal">struct</span> segment <span class="Delimiter">{</span>
+<span id="L111" class="LineNr">111 </span>  <span class="Normal">uint32_t</span> start<span class="Delimiter">;</span>
+<span id="L112" class="LineNr">112 </span>  vector&lt;line&gt; <a href='011run.cc.html#L112'>lines</a><span class="Delimiter">;</span>
+<span id="L113" class="LineNr">113 </span>  <span class="Comment">// End segment Fields</span>
+<span id="L114" class="LineNr">114 </span>  segment<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L115" class="LineNr">115 </span>    start = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L116" class="LineNr">116 </span>    <span class="Comment">// End segment Constructor</span>
+<span id="L117" class="LineNr">117 </span>  <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 segment&quot;)</span>
+<span id="L120" class="LineNr">120 </span><span class="Normal">struct</span> <a href='011run.cc.html#L120'>line</a> <span class="Delimiter">{</span>
+<span id="L121" class="LineNr">121 </span>  vector&lt;word&gt; <a href='011run.cc.html#L121'>words</a><span class="Delimiter">;</span>
 <span id="L122" class="LineNr">122 </span>  vector&lt;string&gt; metadata<span class="Delimiter">;</span>
-<span id="L123" class="LineNr">123 </span><span class="Delimiter">};</span>
-<span id="L124" class="LineNr">124 </span>
-<span id="L125" class="LineNr">125 </span><span class="SalientComment">//:: parse</span>
-<span id="L126" class="LineNr">126 </span>
-<span id="L127" class="LineNr">127 </span><span class="Delimiter">:(code)</span>
-<span id="L128" class="LineNr">128 </span><span class="Normal">void</span> parse<span class="Delimiter">(</span>istream&amp; fin<span class="Delimiter">,</span> program&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L129" class="LineNr">129 </span>  vector&lt;line&gt; l<span class="Delimiter">;</span>
-<span id="L130" class="LineNr">130 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>fin<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L131" class="LineNr">131 </span>    string line_data<span class="Delimiter">;</span>
-<span id="L132" class="LineNr">132 </span>    <a href='011run.cc.html#L113'>line</a> curr<span class="Delimiter">;</span>
-<span id="L133" class="LineNr">133 </span>    getline<span class="Delimiter">(</span>fin<span class="Delimiter">,</span> line_data<span class="Delimiter">);</span>
-<span id="L134" class="LineNr">134 </span>    curr<span class="Delimiter">.</span>original = line_data<span class="Delimiter">;</span>
-<span id="L135" class="LineNr">135 </span>    <a href='003trace.cc.html#L98'>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; end<span class="Delimiter">();</span>
-<span id="L136" class="LineNr">136 </span>    <span class="Comment">// End Line Parsing Special-cases(line_data -&gt; l)</span>
-<span id="L137" class="LineNr">137 </span>    istringstream lin<span class="Delimiter">(</span>line_data<span class="Delimiter">);</span>
-<span id="L138" class="LineNr">138 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>lin<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L139" class="LineNr">139 </span>      string word_data<span class="Delimiter">;</span>
-<span id="L140" class="LineNr">140 </span>      lin &gt;&gt; word_data<span class="Delimiter">;</span>
-<span id="L141" class="LineNr">141 </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="L142" class="LineNr">142 </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="L143" class="LineNr">143 </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="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="Delimiter">{</span>
-<span id="L145" class="LineNr">145 </span>        <a href='011run.cc.html#L175'>flush</a><span class="Delimiter">(</span>out<span class="Delimiter">,</span> l<span class="Delimiter">);</span>
-<span id="L146" class="LineNr">146 </span>        string segment_title<span class="Delimiter">;</span>
-<span id="L147" class="LineNr">147 </span>        lin &gt;&gt; segment_title<span class="Delimiter">;</span>
-<span id="L148" class="LineNr">148 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L102'>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 class="Delimiter">{</span>
-<span id="L149" class="LineNr">149 </span>          segment s<span class="Delimiter">;</span>
-<span id="L150" class="LineNr">150 </span>          s<span class="Delimiter">.</span>start = <a href='011run.cc.html#L355'>parse_int</a><span class="Delimiter">(</span>segment_title<span class="Delimiter">);</span>
-<span id="L151" class="LineNr">151 </span>          <a href='011run.cc.html#L196'>sanity_check_program_segment</a><span class="Delimiter">(</span>out<span class="Delimiter">,</span> s<span class="Delimiter">.</span>start<span class="Delimiter">);</span>
-<span id="L152" class="LineNr">152 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L230'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L153" class="LineNr">153 </span>          <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">3</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 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; s<span class="Delimiter">.</span>start &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L154" class="LineNr">154 </span>          out<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
-<span id="L155" class="LineNr">155 </span>        <span class="Delimiter">}</span>
-<span id="L156" class="LineNr">156 </span>        <span class="Comment">// End Segment Parsing Special-cases(segment_title)</span>
-<span id="L157" class="LineNr">157 </span>        <span class="Comment">// todo: segment segment metadata</span>
-<span id="L158" class="LineNr">158 </span>        <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// skip rest of line</span>
-<span id="L159" class="LineNr">159 </span>      <span class="Delimiter">}</span>
-<span id="L160" class="LineNr">160 </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="L161" class="LineNr">161 </span>        <span class="Comment">// todo: line metadata</span>
-<span id="L162" class="LineNr">162 </span>        <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L163" class="LineNr">163 </span>      <span class="Delimiter">}</span>
-<span id="L164" class="LineNr">164 </span>      curr<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L119'>word</a><span class="Delimiter">());</span>
-<span id="L165" class="LineNr">165 </span>      <a href='011run.cc.html#L186'>parse_word</a><span class="Delimiter">(</span>word_data<span class="Delimiter">,</span> curr<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">());</span>
-<span id="L166" class="LineNr">166 </span>      <a href='003trace.cc.html#L98'>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;word: &quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>back<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#L114'>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>  <a href='011run.cc.html#L175'>flush</a><span class="Delimiter">(</span>out<span class="Delimiter">,</span> l<span class="Delimiter">);</span>
-<span id="L172" class="LineNr">172 </span>  <a href='003trace.cc.html#L98'>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; end<span class="Delimiter">();</span>
-<span id="L173" class="LineNr">173 </span><span class="Delimiter">}</span>
-<span id="L174" class="LineNr">174 </span>
-<span id="L175" class="LineNr">175 </span><span class="Normal">void</span> <a href='011run.cc.html#L175'>flush</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">,</span> vector&lt;line&gt;&amp; <a href='011run.cc.html#L105'>lines</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L176" class="LineNr">176 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L177" class="LineNr">177 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L178" class="LineNr">178 </span>    <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;input does not start with a '==' section header\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L179" class="LineNr">179 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L180" class="LineNr">180 </span>  <span class="Delimiter">}</span>
-<span id="L181" class="LineNr">181 </span>  <span class="Comment">// End flush(p, lines) Special-cases</span>
-<span id="L182" class="LineNr">182 </span>  <a href='003trace.cc.html#L98'>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 segment&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L183" class="LineNr">183 </span>  p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span><a href='011run.cc.html#L105'>lines</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'>parse_word</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; data<span class="Delimiter">,</span> word&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L187" class="LineNr">187 </span>  out<span class="Delimiter">.</span>original = data<span class="Delimiter">;</span>
-<span id="L188" class="LineNr">188 </span>  istringstream win<span class="Delimiter">(</span>data<span class="Delimiter">);</span>
-<span id="L189" class="LineNr">189 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>getline<span class="Delimiter">(</span>win<span class="Delimiter">,</span> out<span class="Delimiter">.</span>data<span class="Delimiter">,</span> <span class="Constant">'/'</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L190" class="LineNr">190 </span>    string m<span class="Delimiter">;</span>
-<span id="L191" class="LineNr">191 </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="L192" class="LineNr">192 </span>      out<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>m<span class="Delimiter">);</span>
-<span id="L193" class="LineNr">193 </span>  <span class="Delimiter">}</span>
-<span id="L194" class="LineNr">194 </span><span class="Delimiter">}</span>
-<span id="L195" class="LineNr">195 </span>
-<span id="L196" class="LineNr">196 </span><span class="Normal">void</span> <a href='011run.cc.html#L196'>sanity_check_program_segment</a><span class="Delimiter">(</span><span class="Normal">const</span> program&amp; p<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L197" class="LineNr">197 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L198" class="LineNr">198 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>start == addr<span class="Delimiter">)</span>
-<span id="L199" class="LineNr">199 </span>      <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;can't have multiple segments starting at address 0x&quot;</span> &lt;&lt; HEXWORD &lt;&lt; addr &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L123" class="LineNr">123 </span>  string original<span class="Delimiter">;</span>
+<span id="L124" class="LineNr">124 </span><span class="Delimiter">};</span>
+<span id="L125" class="LineNr">125 </span><span class="Delimiter">:(before &quot;struct line&quot;)</span>
+<span id="L126" class="LineNr">126 </span><span class="Normal">struct</span> <a href='011run.cc.html#L126'>word</a> <span class="Delimiter">{</span>
+<span id="L127" class="LineNr">127 </span>  string original<span class="Delimiter">;</span>
+<span id="L128" class="LineNr">128 </span>  string data<span class="Delimiter">;</span>
+<span id="L129" class="LineNr">129 </span>  vector&lt;string&gt; metadata<span class="Delimiter">;</span>
+<span id="L130" class="LineNr">130 </span><span class="Delimiter">};</span>
+<span id="L131" class="LineNr">131 </span>
+<span id="L132" class="LineNr">132 </span><span class="SalientComment">//:: parse</span>
+<span id="L133" class="LineNr">133 </span>
+<span id="L134" class="LineNr">134 </span><span class="Delimiter">:(code)</span>
+<span id="L135" class="LineNr">135 </span><span class="Normal">void</span> parse<span class="Delimiter">(</span>istream&amp; fin<span class="Delimiter">,</span> program&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L136" class="LineNr">136 </span>  vector&lt;line&gt; l<span class="Delimiter">;</span>
+<span id="L137" class="LineNr">137 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>fin<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L138" class="LineNr">138 </span>    string line_data<span class="Delimiter">;</span>
+<span id="L139" class="LineNr">139 </span>    <a href='011run.cc.html#L120'>line</a> curr<span class="Delimiter">;</span>
+<span id="L140" class="LineNr">140 </span>    getline<span class="Delimiter">(</span>fin<span class="Delimiter">,</span> line_data<span class="Delimiter">);</span>
+<span id="L141" class="LineNr">141 </span>    curr<span class="Delimiter">.</span>original = line_data<span class="Delimiter">;</span>
+<span id="L142" class="LineNr">142 </span>    <a href='003trace.cc.html#L96'>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; end<span class="Delimiter">();</span>
+<span id="L143" class="LineNr">143 </span>    <span class="Comment">// End Line Parsing Special-cases(line_data -&gt; l)</span>
+<span id="L144" class="LineNr">144 </span>    istringstream lin<span class="Delimiter">(</span>line_data<span class="Delimiter">);</span>
+<span id="L145" class="LineNr">145 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>lin<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L146" class="LineNr">146 </span>      string word_data<span class="Delimiter">;</span>
+<span id="L147" class="LineNr">147 </span>      lin &gt;&gt; word_data<span class="Delimiter">;</span>
+<span id="L148" class="LineNr">148 </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="L149" class="LineNr">149 </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="L150" class="LineNr">150 </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="L151" class="LineNr">151 </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="L152" class="LineNr">152 </span>        <a href='011run.cc.html#L182'>flush</a><span class="Delimiter">(</span>out<span class="Delimiter">,</span> l<span class="Delimiter">);</span>
+<span id="L153" class="LineNr">153 </span>        string segment_title<span class="Delimiter">;</span>
+<span id="L154" class="LineNr">154 </span>        lin &gt;&gt; segment_title<span class="Delimiter">;</span>
+<span id="L155" class="LineNr">155 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L102'>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 class="Delimiter">{</span>
+<span id="L156" class="LineNr">156 </span>          segment s<span class="Delimiter">;</span>
+<span id="L157" class="LineNr">157 </span>          s<span class="Delimiter">.</span>start = <a href='011run.cc.html#L382'>parse_int</a><span class="Delimiter">(</span>segment_title<span class="Delimiter">);</span>
+<span id="L158" class="LineNr">158 </span>          <a href='011run.cc.html#L203'>sanity_check_program_segment</a><span class="Delimiter">(</span>out<span class="Delimiter">,</span> s<span class="Delimiter">.</span>start<span class="Delimiter">);</span>
+<span id="L159" class="LineNr">159 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L238'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L160" class="LineNr">160 </span>          <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">3</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 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; s<span class="Delimiter">.</span>start &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L161" class="LineNr">161 </span>          out<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
+<span id="L162" class="LineNr">162 </span>        <span class="Delimiter">}</span>
+<span id="L163" class="LineNr">163 </span>        <span class="Comment">// End Segment Parsing Special-cases(segment_title)</span>
+<span id="L164" class="LineNr">164 </span>        <span class="Comment">// todo: segment segment metadata</span>
+<span id="L165" class="LineNr">165 </span>        <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// skip rest of line</span>
+<span id="L166" class="LineNr">166 </span>      <span class="Delimiter">}</span>
+<span id="L167" class="LineNr">167 </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="L168" class="LineNr">168 </span>        <span class="Comment">// todo: line metadata</span>
+<span id="L169" class="LineNr">169 </span>        <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L170" class="LineNr">170 </span>      <span class="Delimiter">}</span>
+<span id="L171" class="LineNr">171 </span>      curr<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L126'>word</a><span class="Delimiter">());</span>
+<span id="L172" class="LineNr">172 </span>      <a href='011run.cc.html#L193'>parse_word</a><span class="Delimiter">(</span>word_data<span class="Delimiter">,</span> curr<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">());</span>
+<span id="L173" class="LineNr">173 </span>      <a href='003trace.cc.html#L96'>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;word: &quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>back<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#L121'>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>  <a href='011run.cc.html#L182'>flush</a><span class="Delimiter">(</span>out<span class="Delimiter">,</span> l<span class="Delimiter">);</span>
+<span id="L179" class="LineNr">179 </span>  <a href='003trace.cc.html#L96'>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; end<span class="Delimiter">();</span>
+<span id="L180" class="LineNr">180 </span><span class="Delimiter">}</span>
+<span id="L181" class="LineNr">181 </span>
+<span id="L182" class="LineNr">182 </span><span class="Normal">void</span> <a href='011run.cc.html#L182'>flush</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">,</span> vector&lt;line&gt;&amp; <a href='011run.cc.html#L112'>lines</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L183" class="LineNr">183 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L184" class="LineNr">184 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L185" class="LineNr">185 </span>    <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;input does not start with a '==' section header\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L186" class="LineNr">186 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L187" class="LineNr">187 </span>  <span class="Delimiter">}</span>
+<span id="L188" class="LineNr">188 </span>  <span class="Comment">// End flush(p, lines) Special-cases</span>
+<span id="L189" class="LineNr">189 </span>  <a href='003trace.cc.html#L96'>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 segment&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L190" class="LineNr">190 </span>  p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">);</span>
+<span id="L191" class="LineNr">191 </span><span class="Delimiter">}</span>
+<span id="L192" class="LineNr">192 </span>
+<span id="L193" class="LineNr">193 </span><span class="Normal">void</span> <a href='011run.cc.html#L193'>parse_word</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; data<span class="Delimiter">,</span> word&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L194" class="LineNr">194 </span>  out<span class="Delimiter">.</span>original = data<span class="Delimiter">;</span>
+<span id="L195" class="LineNr">195 </span>  istringstream win<span class="Delimiter">(</span>data<span class="Delimiter">);</span>
+<span id="L196" class="LineNr">196 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>getline<span class="Delimiter">(</span>win<span class="Delimiter">,</span> out<span class="Delimiter">.</span>data<span class="Delimiter">,</span> <span class="Constant">'/'</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L197" class="LineNr">197 </span>    string m<span class="Delimiter">;</span>
+<span id="L198" class="LineNr">198 </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="L199" class="LineNr">199 </span>      out<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>m<span class="Delimiter">);</span>
 <span id="L200" class="LineNr">200 </span>  <span class="Delimiter">}</span>
 <span id="L201" class="LineNr">201 </span><span class="Delimiter">}</span>
 <span id="L202" class="LineNr">202 </span>
-<span id="L203" class="LineNr">203 </span><span class="Comment">// helper for tests</span>
-<span id="L204" class="LineNr">204 </span><span class="Normal">void</span> parse<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L205" class="LineNr">205 </span>  <a href='011run.cc.html#L95'>program</a> p<span class="Delimiter">;</span>
-<span id="L206" class="LineNr">206 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
-<span id="L207" class="LineNr">207 </span>  parse<span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
+<span id="L203" class="LineNr">203 </span><span class="Normal">void</span> <a href='011run.cc.html#L203'>sanity_check_program_segment</a><span class="Delimiter">(</span><span class="Normal">const</span> program&amp; p<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L204" class="LineNr">204 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L205" class="LineNr">205 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>start == addr<span class="Delimiter">)</span>
+<span id="L206" class="LineNr">206 </span>      <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;can't have multiple segments starting at address 0x&quot;</span> &lt;&lt; HEXWORD &lt;&lt; addr &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L207" class="LineNr">207 </span>  <span class="Delimiter">}</span>
 <span id="L208" class="LineNr">208 </span><span class="Delimiter">}</span>
 <span id="L209" class="LineNr">209 </span>
-<span id="L210" class="LineNr">210 </span><span class="Delimiter">:(scenarios parse)</span>
-<span id="L211" class="LineNr">211 </span><span class="Delimiter">:(scenario detect_duplicate_segments)</span>
-<span id="L212" class="LineNr">212 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L213" class="LineNr">213 </span>== <span class="Constant">0xee</span>
-<span id="L214" class="LineNr">214 </span>ab
-<span id="L215" class="LineNr">215 </span>== <span class="Constant">0xee</span>
-<span id="L216" class="LineNr">216 </span>cd
-<span id="L217" class="LineNr">217 </span><span class="traceContains">+error: can't have multiple segments starting at address 0x000000ee</span>
-<span id="L218" class="LineNr">218 </span>
-<span id="L219" class="LineNr">219 </span><span class="SalientComment">//:: transform</span>
-<span id="L220" class="LineNr">220 </span>
-<span id="L221" class="LineNr">221 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L222" class="LineNr">222 </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="L223" class="LineNr">223 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L224" class="LineNr">224 </span>vector&lt;transform_fn&gt; <span class="Special"><a href='011run.cc.html#L224'>Transform</a></span><span class="Delimiter">;</span>
-<span id="L225" class="LineNr">225 </span>
-<span id="L226" class="LineNr">226 </span><span class="Delimiter">:(code)</span>
-<span id="L227" class="LineNr">227 </span><span class="Normal">void</span> <a href='011run.cc.html#L227'>transform</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L228" class="LineNr">228 </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#L166'>SIZE</a><span class="Delimiter">(</span><span class="Special"><a href='011run.cc.html#L224'>Transform</a></span><span class="Delimiter">);</span>  ++t<span class="Delimiter">)</span>
-<span id="L229" class="LineNr">229 </span>    <span class="Delimiter">(</span>*<span class="Special"><a href='011run.cc.html#L224'>Transform</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>t<span class="Delimiter">))(</span>p<span class="Delimiter">);</span>
-<span id="L230" class="LineNr">230 </span><span class="Delimiter">}</span>
+<span id="L210" class="LineNr">210 </span><span class="Comment">// helper for tests</span>
+<span id="L211" class="LineNr">211 </span><span class="Normal">void</span> parse<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L212" class="LineNr">212 </span>  <a href='011run.cc.html#L102'>program</a> p<span class="Delimiter">;</span>
+<span id="L213" class="LineNr">213 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
+<span id="L214" class="LineNr">214 </span>  parse<span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
+<span id="L215" class="LineNr">215 </span><span class="Delimiter">}</span>
+<span id="L216" class="LineNr">216 </span>
+<span id="L217" class="LineNr">217 </span><span class="Normal">void</span> <a href='011run.cc.html#L217'>test_detect_duplicate_segments</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L218" class="LineNr">218 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L219" class="LineNr">219 </span>  parse<span class="Delimiter">(</span>
+<span id="L220" class="LineNr">220 </span>      <span class="Constant">&quot;== 0xee\n&quot;</span>
+<span id="L221" class="LineNr">221 </span>      <span class="Constant">&quot;ab\n&quot;</span>
+<span id="L222" class="LineNr">222 </span>      <span class="Constant">&quot;== 0xee\n&quot;</span>
+<span id="L223" class="LineNr">223 </span>      <span class="Constant">&quot;cd\n&quot;</span>
+<span id="L224" class="LineNr">224 </span>  <span class="Delimiter">);</span>
+<span id="L225" class="LineNr">225 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L226" class="LineNr">226 </span>      <span class="Constant">&quot;error: can't have multiple segments starting at address 0x000000ee\n&quot;</span>
+<span id="L227" class="LineNr">227 </span>  <span class="Delimiter">);</span>
+<span id="L228" class="LineNr">228 </span><span class="Delimiter">}</span>
+<span id="L229" class="LineNr">229 </span>
+<span id="L230" class="LineNr">230 </span><span class="SalientComment">//:: transform</span>
 <span id="L231" class="LineNr">231 </span>
-<span id="L232" class="LineNr">232 </span><span class="SalientComment">//:: load</span>
-<span id="L233" class="LineNr">233 </span>
-<span id="L234" class="LineNr">234 </span><span class="Normal">void</span> <a href='011run.cc.html#L234'>load</a><span class="Delimiter">(</span><span class="Normal">const</span> program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L235" class="LineNr">235 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L236" class="LineNr">236 </span>    <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;no <a href='031check_operands.cc.html#L11'>code</a> to run\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L237" class="LineNr">237 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L238" class="LineNr">238 </span>  <span class="Delimiter">}</span>
-<span id="L239" class="LineNr">239 </span>  <span class="Comment">// Ensure segments are disjoint.</span>
-<span id="L240" class="LineNr">240 </span>  set&lt;<span class="Normal">uint32_t</span>&gt; overlap<span class="Delimiter">;</span>
-<span id="L241" class="LineNr">241 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>   i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L242" class="LineNr">242 </span>    <span class="Normal">const</span> segment&amp; seg = p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L243" class="LineNr">243 </span>    <span class="Normal">uint32_t</span> addr = seg<span class="Delimiter">.</span>start<span class="Delimiter">;</span>
-<span id="L244" class="LineNr">244 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!already_allocated<span class="Delimiter">(</span>addr<span class="Delimiter">))</span>
-<span id="L245" class="LineNr">245 </span>      <span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>vma<span class="Delimiter">(</span>seg<span class="Delimiter">.</span>start<span class="Delimiter">));</span>
-<span id="L246" class="LineNr">246 </span>    <a href='003trace.cc.html#L98'>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#L433'>HEXWORD</a> &lt;&lt; addr &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L247" class="LineNr">247 </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#L166'>SIZE</a><span class="Delimiter">(</span>seg<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L248" class="LineNr">248 </span>      <span class="Normal">const</span> line&amp; l = seg<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
-<span id="L249" class="LineNr">249 </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#L166'>SIZE</a><span class="Delimiter">(</span>l<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">);</span>  ++k<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L250" class="LineNr">250 </span>        <span class="Normal">const</span> word&amp; w = l<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>k<span class="Delimiter">);</span>
-<span id="L251" class="LineNr">251 </span>        <span class="Normal">uint8_t</span> val = <a href='011run.cc.html#L266'>hex_byte</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L252" class="LineNr">252 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L230'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L253" class="LineNr">253 </span>        assert<span class="Delimiter">(</span>overlap<span class="Delimiter">.</span>find<span class="Delimiter">(</span>addr<span class="Delimiter">)</span> == overlap<span class="Delimiter">.</span>end<span class="Delimiter">());</span>
-<span id="L254" class="LineNr">254 </span>        <a href='010---vm.cc.html#L263'>write_mem_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">,</span> val<span class="Delimiter">);</span>
-<span id="L255" class="LineNr">255 </span>        overlap<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>addr<span class="Delimiter">);</span>
-<span id="L256" class="LineNr">256 </span>        <a href='003trace.cc.html#L98'>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#L433'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L432'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L202'>read_mem_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">))</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L257" class="LineNr">257 </span>        ++addr<span class="Delimiter">;</span>
-<span id="L258" class="LineNr">258 </span>      <span class="Delimiter">}</span>
-<span id="L259" class="LineNr">259 </span>    <span class="Delimiter">}</span>
-<span id="L260" class="LineNr">260 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Special"><a href='010---vm.cc.html#L194'>End_of_program</a></span> = addr<span class="Delimiter">;</span>
-<span id="L261" class="LineNr">261 </span>  <span class="Delimiter">}</span>
-<span id="L262" class="LineNr">262 </span>  EIP = p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>start<span class="Delimiter">;</span>
-<span id="L263" class="LineNr">263 </span>  <span class="Comment">// End Initialize EIP</span>
-<span id="L264" class="LineNr">264 </span><span class="Delimiter">}</span>
-<span id="L265" class="LineNr">265 </span>
-<span id="L266" class="LineNr">266 </span><span class="Normal">uint8_t</span> <a href='011run.cc.html#L266'>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="L267" class="LineNr">267 </span>  istringstream in<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
-<span id="L268" class="LineNr">268 </span>  <span class="Normal">int</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L269" class="LineNr">269 </span>  in &gt;&gt; std::hex &gt;&gt; result<span class="Delimiter">;</span>
-<span id="L270" class="LineNr">270 </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="L271" class="LineNr">271 </span>    <a href='003trace.cc.html#L217'>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\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L272" class="LineNr">272 </span>    <span class="Identifier">return</span> <span class="cSpecial">'\0'</span><span class="Delimiter">;</span>
-<span id="L273" class="LineNr">273 </span>  <span class="Delimiter">}</span>
-<span id="L274" class="LineNr">274 </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="L275" class="LineNr">275 </span>    <a href='003trace.cc.html#L217'>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\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L276" class="LineNr">276 </span>    <span class="Identifier">return</span> <span class="cSpecial">'\0'</span><span class="Delimiter">;</span>
-<span id="L277" class="LineNr">277 </span>  <span class="Delimiter">}</span>
-<span id="L278" class="LineNr">278 </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="L279" class="LineNr">279 </span><span class="Delimiter">}</span>
-<span id="L280" class="LineNr">280 </span>
-<span id="L281" class="LineNr">281 </span><span class="Delimiter">:(scenarios parse_and_load)</span>
-<span id="L282" class="LineNr">282 </span><span class="Delimiter">:(scenario number_too_large)</span>
-<span id="L283" class="LineNr">283 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L284" class="LineNr">284 </span>== <span class="Constant">0x1</span>
-<span id="L285" class="LineNr">285 </span><span class="PreProc">0</span><span class="Constant">5</span> cab
-<span id="L286" class="LineNr">286 </span><span class="traceContains">+error: token 'cab' is not a hex byte</span>
-<span id="L287" class="LineNr">287 </span>
-<span id="L288" class="LineNr">288 </span><span class="Delimiter">:(scenario invalid_hex)</span>
-<span id="L289" class="LineNr">289 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L290" class="LineNr">290 </span>== <span class="Constant">0x1</span>
-<span id="L291" class="LineNr">291 </span><span class="PreProc">0</span><span class="Constant">5</span> cx
-<span id="L292" class="LineNr">292 </span><span class="traceContains">+error: token 'cx' is not a hex byte</span>
-<span id="L293" class="LineNr">293 </span>
-<span id="L294" class="LineNr">294 </span><span class="Delimiter">:(scenario negative_number)</span>
-<span id="L295" class="LineNr">295 </span>== <span class="Constant">0x1</span>
-<span id="L296" class="LineNr">296 </span><span class="PreProc">0</span><span class="Constant">5</span> -<span class="Constant">12</span>
-<span id="L297" class="LineNr">297 </span>$error: <span class="Constant">0</span>
-<span id="L298" class="LineNr">298 </span>
-<span id="L299" class="LineNr">299 </span><span class="Delimiter">:(scenario negative_number_too_small)</span>
-<span id="L300" class="LineNr">300 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L301" class="LineNr">301 </span>== <span class="Constant">0x1</span>
-<span id="L302" class="LineNr">302 </span><span class="PreProc">0</span><span class="Constant">5</span> -<span class="Constant">12345</span>
-<span id="L303" class="LineNr">303 </span><span class="traceContains">+error: token '-12345' is not a hex byte</span>
-<span id="L304" class="LineNr">304 </span>
-<span id="L305" class="LineNr">305 </span><span class="Delimiter">:(scenario hex_prefix)</span>
-<span id="L306" class="LineNr">306 </span>== <span class="Constant">0x1</span>
-<span id="L307" class="LineNr">307 </span><span class="Constant">0x05</span> -<span class="Constant">0x12</span>
-<span id="L308" class="LineNr">308 </span>$error: <span class="Constant">0</span>
-<span id="L309" class="LineNr">309 </span>
-<span id="L310" class="LineNr">310 </span><span class="Comment">//: helper for tests</span>
-<span id="L311" class="LineNr">311 </span><span class="Delimiter">:(code)</span>
-<span id="L312" class="LineNr">312 </span><span class="Normal">void</span> <a href='011run.cc.html#L312'>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="L313" class="LineNr">313 </span>  <a href='011run.cc.html#L95'>program</a> p<span class="Delimiter">;</span>
-<span id="L314" class="LineNr">314 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
-<span id="L315" class="LineNr">315 </span>  parse<span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
-<span id="L316" class="LineNr">316 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L230'>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="L317" class="LineNr">317 </span>  <a href='011run.cc.html#L234'>load</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
-<span id="L318" class="LineNr">318 </span><span class="Delimiter">}</span>
-<span id="L319" class="LineNr">319 </span>
-<span id="L320" class="LineNr">320 </span><span class="SalientComment">//:: run</span>
+<span id="L232" class="LineNr">232 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L233" class="LineNr">233 </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="L234" class="LineNr">234 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L235" class="LineNr">235 </span>vector&lt;transform_fn&gt; <span class="Special"><a href='011run.cc.html#L235'>Transform</a></span><span class="Delimiter">;</span>
+<span id="L236" class="LineNr">236 </span>
+<span id="L237" class="LineNr">237 </span><span class="Delimiter">:(code)</span>
+<span id="L238" class="LineNr">238 </span><span class="Normal">void</span> transform<span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L239" class="LineNr">239 </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#L166'>SIZE</a><span class="Delimiter">(</span><span class="Special"><a href='011run.cc.html#L235'>Transform</a></span><span class="Delimiter">);</span>  ++t<span class="Delimiter">)</span>
+<span id="L240" class="LineNr">240 </span>    <span class="Delimiter">(</span>*<span class="Special"><a href='011run.cc.html#L235'>Transform</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>t<span class="Delimiter">))(</span>p<span class="Delimiter">);</span>
+<span id="L241" class="LineNr">241 </span><span class="Delimiter">}</span>
+<span id="L242" class="LineNr">242 </span>
+<span id="L243" class="LineNr">243 </span><span class="SalientComment">//:: load</span>
+<span id="L244" class="LineNr">244 </span>
+<span id="L245" class="LineNr">245 </span><span class="Normal">void</span> <a href='011run.cc.html#L245'>load</a><span class="Delimiter">(</span><span class="Normal">const</span> program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L246" class="LineNr">246 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L247" class="LineNr">247 </span>    <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;no code to run\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L248" class="LineNr">248 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L249" class="LineNr">249 </span>  <span class="Delimiter">}</span>
+<span id="L250" class="LineNr">250 </span>  <span class="Comment">// Ensure segments are disjoint.</span>
+<span id="L251" class="LineNr">251 </span>  set&lt;<span class="Normal">uint32_t</span>&gt; overlap<span class="Delimiter">;</span>
+<span id="L252" class="LineNr">252 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>   i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L253" class="LineNr">253 </span>    <span class="Normal">const</span> segment&amp; seg = p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L254" class="LineNr">254 </span>    <span class="Normal">uint32_t</span> addr = seg<span class="Delimiter">.</span>start<span class="Delimiter">;</span>
+<span id="L255" class="LineNr">255 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!already_allocated<span class="Delimiter">(</span>addr<span class="Delimiter">))</span>
+<span id="L256" class="LineNr">256 </span>      <span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>vma<span class="Delimiter">(</span>seg<span class="Delimiter">.</span>start<span class="Delimiter">));</span>
+<span id="L257" class="LineNr">257 </span>    <a href='003trace.cc.html#L96'>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#L440'>HEXWORD</a> &lt;&lt; addr &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L258" class="LineNr">258 </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#L166'>SIZE</a><span class="Delimiter">(</span>seg<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L259" class="LineNr">259 </span>      <span class="Normal">const</span> line&amp; l = seg<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
+<span id="L260" class="LineNr">260 </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#L166'>SIZE</a><span class="Delimiter">(</span>l<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">);</span>  ++k<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L261" class="LineNr">261 </span>        <span class="Normal">const</span> word&amp; w = l<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>k<span class="Delimiter">);</span>
+<span id="L262" class="LineNr">262 </span>        <span class="Normal">uint8_t</span> val = <a href='011run.cc.html#L277'>hex_byte</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L263" class="LineNr">263 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L238'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L264" class="LineNr">264 </span>        assert<span class="Delimiter">(</span>overlap<span class="Delimiter">.</span>find<span class="Delimiter">(</span>addr<span class="Delimiter">)</span> == overlap<span class="Delimiter">.</span>end<span class="Delimiter">());</span>
+<span id="L265" class="LineNr">265 </span>        <a href='010---vm.cc.html#L263'>write_mem_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">,</span> val<span class="Delimiter">);</span>
+<span id="L266" class="LineNr">266 </span>        overlap<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>addr<span class="Delimiter">);</span>
+<span id="L267" class="LineNr">267 </span>        <a href='003trace.cc.html#L96'>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#L440'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L439'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L202'>read_mem_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">))</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L268" class="LineNr">268 </span>        ++addr<span class="Delimiter">;</span>
+<span id="L269" class="LineNr">269 </span>      <span class="Delimiter">}</span>
+<span id="L270" class="LineNr">270 </span>    <span class="Delimiter">}</span>
+<span id="L271" class="LineNr">271 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Special"><a href='010---vm.cc.html#L194'>End_of_program</a></span> = addr<span class="Delimiter">;</span>
+<span id="L272" class="LineNr">272 </span>  <span class="Delimiter">}</span>
+<span id="L273" class="LineNr">273 </span>  EIP = p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>start<span class="Delimiter">;</span>
+<span id="L274" class="LineNr">274 </span>  <span class="Comment">// End Initialize EIP</span>
+<span id="L275" class="LineNr">275 </span><span class="Delimiter">}</span>
+<span id="L276" class="LineNr">276 </span>
+<span id="L277" class="LineNr">277 </span><span class="Normal">uint8_t</span> <a href='011run.cc.html#L277'>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="L278" class="LineNr">278 </span>  istringstream in<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
+<span id="L279" class="LineNr">279 </span>  <span class="Normal">int</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L280" class="LineNr">280 </span>  in &gt;&gt; std::hex &gt;&gt; result<span class="Delimiter">;</span>
+<span id="L281" class="LineNr">281 </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="L282" class="LineNr">282 </span>    <a href='003trace.cc.html#L202'>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\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L283" class="LineNr">283 </span>    <span class="Identifier">return</span> <span class="cSpecial">'\0'</span><span class="Delimiter">;</span>
+<span id="L284" class="LineNr">284 </span>  <span class="Delimiter">}</span>
+<span id="L285" class="LineNr">285 </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="L286" class="LineNr">286 </span>    <a href='003trace.cc.html#L202'>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\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L287" class="LineNr">287 </span>    <span class="Identifier">return</span> <span class="cSpecial">'\0'</span><span class="Delimiter">;</span>
+<span id="L288" class="LineNr">288 </span>  <span class="Delimiter">}</span>
+<span id="L289" class="LineNr">289 </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="L290" class="LineNr">290 </span><span class="Delimiter">}</span>
+<span id="L291" class="LineNr">291 </span>
+<span id="L292" class="LineNr">292 </span><span class="Normal">void</span> <a href='011run.cc.html#L292'>test_number_too_large</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L293" class="LineNr">293 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L294" class="LineNr">294 </span>  <a href='011run.cc.html#L342'>parse_and_load</a><span class="Delimiter">(</span>
+<span id="L295" class="LineNr">295 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>
+<span id="L296" class="LineNr">296 </span>      <span class="Constant">&quot;05 cab\n&quot;</span>
+<span id="L297" class="LineNr">297 </span>  <span class="Delimiter">);</span>
+<span id="L298" class="LineNr">298 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L299" class="LineNr">299 </span>      <span class="Constant">&quot;error: token 'cab' is not a hex byte\n&quot;</span>
+<span id="L300" class="LineNr">300 </span>  <span class="Delimiter">);</span>
+<span id="L301" class="LineNr">301 </span><span class="Delimiter">}</span>
+<span id="L302" class="LineNr">302 </span>
+<span id="L303" class="LineNr">303 </span><span class="Normal">void</span> <a href='011run.cc.html#L303'>test_invalid_hex</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L304" class="LineNr">304 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L305" class="LineNr">305 </span>  <a href='011run.cc.html#L342'>parse_and_load</a><span class="Delimiter">(</span>
+<span id="L306" class="LineNr">306 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>
+<span id="L307" class="LineNr">307 </span>      <span class="Constant">&quot;05 cx\n&quot;</span>
+<span id="L308" class="LineNr">308 </span>  <span class="Delimiter">);</span>
+<span id="L309" class="LineNr">309 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L310" class="LineNr">310 </span>      <span class="Constant">&quot;error: token 'cx' is not a hex byte\n&quot;</span>
+<span id="L311" class="LineNr">311 </span>  <span class="Delimiter">);</span>
+<span id="L312" class="LineNr">312 </span><span class="Delimiter">}</span>
+<span id="L313" class="LineNr">313 </span>
+<span id="L314" class="LineNr">314 </span><span class="Normal">void</span> <a href='011run.cc.html#L314'>test_negative_number</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L315" class="LineNr">315 </span>  <a href='011run.cc.html#L342'>parse_and_load</a><span class="Delimiter">(</span>
+<span id="L316" class="LineNr">316 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>
+<span id="L317" class="LineNr">317 </span>      <span class="Constant">&quot;05 -12\n&quot;</span>
+<span id="L318" class="LineNr">318 </span>  <span class="Delimiter">);</span>
+<span id="L319" class="LineNr">319 </span>  <a href='003trace.cc.html#L270'>CHECK_TRACE_COUNT</a><span class="Delimiter">(</span><span class="Constant">&quot;error&quot;</span><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L320" class="LineNr">320 </span><span class="Delimiter">}</span>
 <span id="L321" class="LineNr">321 </span>
-<span id="L322" class="LineNr">322 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L323" class="LineNr">323 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;05&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add <a href='037heap.cc.html#L23'>imm32</a> to <a href='010---vm.cc.html#L13'>EAX</a> (add)&quot;</span><span class="Delimiter">);</span>
-<span id="L324" class="LineNr">324 </span>
-<span id="L325" class="LineNr">325 </span><span class="Comment">//: our first opcode</span>
-<span id="L326" class="LineNr">326 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L327" class="LineNr">327 </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="L328" class="LineNr">328 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L336'>next32</a><span class="Delimiter">();</span>
-<span id="L329" class="LineNr">329 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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='037heap.cc.html#L23'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>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; end<span class="Delimiter">();</span>
-<span id="L330" class="LineNr">330 </span>  <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L331" class="LineNr">331 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L332" class="LineNr">332 </span><span class="Delimiter">}</span>
-<span id="L333" class="LineNr">333 </span>
-<span id="L334" class="LineNr">334 </span><span class="Delimiter">:(code)</span>
-<span id="L335" class="LineNr">335 </span><span class="Comment">// read a 32-bit int in little-endian order from the instruction stream</span>
-<span id="L336" class="LineNr">336 </span><span class="Normal">int32_t</span> <a href='011run.cc.html#L336'>next32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L337" class="LineNr">337 </span>  <span class="Normal">int32_t</span> result = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L338" class="LineNr">338 </span>  result |= <span class="Delimiter">(</span><a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
-<span id="L339" class="LineNr">339 </span>  result |= <span class="Delimiter">(</span><a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">16</span><span class="Delimiter">);</span>
-<span id="L340" class="LineNr">340 </span>  result |= <span class="Delimiter">(</span><a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">24</span><span class="Delimiter">);</span>
-<span id="L341" class="LineNr">341 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L342" class="LineNr">342 </span><span class="Delimiter">}</span>
-<span id="L343" class="LineNr">343 </span>
-<span id="L344" class="LineNr">344 </span><span class="SalientComment">//:: helpers</span>
-<span id="L345" class="LineNr">345 </span>
-<span id="L346" class="LineNr">346 </span><span class="Delimiter">:(code)</span>
-<span id="L347" class="LineNr">347 </span>string to_string<span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L348" class="LineNr">348 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L349" class="LineNr">349 </span>  out &lt;&lt; w<span class="Delimiter">.</span>data<span class="Delimiter">;</span>
-<span id="L350" class="LineNr">350 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L351" class="LineNr">351 </span>    out &lt;&lt; <span class="Constant">&quot; /&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L352" class="LineNr">352 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L353" class="LineNr">353 </span><span class="Delimiter">}</span>
+<span id="L322" class="LineNr">322 </span><span class="Normal">void</span> <a href='011run.cc.html#L322'>test_negative_number_too_small</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L323" class="LineNr">323 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L324" class="LineNr">324 </span>  <a href='011run.cc.html#L342'>parse_and_load</a><span class="Delimiter">(</span>
+<span id="L325" class="LineNr">325 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>
+<span id="L326" class="LineNr">326 </span>      <span class="Constant">&quot;05 -12345\n&quot;</span>
+<span id="L327" class="LineNr">327 </span>  <span class="Delimiter">);</span>
+<span id="L328" class="LineNr">328 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L329" class="LineNr">329 </span>      <span class="Constant">&quot;error: token '-12345' is not a hex byte\n&quot;</span>
+<span id="L330" class="LineNr">330 </span>  <span class="Delimiter">);</span>
+<span id="L331" class="LineNr">331 </span><span class="Delimiter">}</span>
+<span id="L332" class="LineNr">332 </span>
+<span id="L333" class="LineNr">333 </span><span class="Normal">void</span> <a href='011run.cc.html#L333'>test_hex_prefix</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L334" class="LineNr">334 </span>  <a href='011run.cc.html#L342'>parse_and_load</a><span class="Delimiter">(</span>
+<span id="L335" class="LineNr">335 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>
+<span id="L336" class="LineNr">336 </span>      <span class="Constant">&quot;0x05 -0x12\n&quot;</span>
+<span id="L337" class="LineNr">337 </span>  <span class="Delimiter">);</span>
+<span id="L338" class="LineNr">338 </span>  <a href='003trace.cc.html#L270'>CHECK_TRACE_COUNT</a><span class="Delimiter">(</span><span class="Constant">&quot;error&quot;</span><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L339" class="LineNr">339 </span><span class="Delimiter">}</span>
+<span id="L340" class="LineNr">340 </span>
+<span id="L341" class="LineNr">341 </span><span class="Comment">//: helper for tests</span>
+<span id="L342" class="LineNr">342 </span><span class="Normal">void</span> <a href='011run.cc.html#L342'>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="L343" class="LineNr">343 </span>  <a href='011run.cc.html#L102'>program</a> p<span class="Delimiter">;</span>
+<span id="L344" class="LineNr">344 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
+<span id="L345" class="LineNr">345 </span>  parse<span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
+<span id="L346" class="LineNr">346 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L238'>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="L347" class="LineNr">347 </span>  <a href='011run.cc.html#L245'>load</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
+<span id="L348" class="LineNr">348 </span><span class="Delimiter">}</span>
+<span id="L349" class="LineNr">349 </span>
+<span id="L350" class="LineNr">350 </span><span class="SalientComment">//:: run</span>
+<span id="L351" class="LineNr">351 </span>
+<span id="L352" class="LineNr">352 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L353" class="LineNr">353 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;05&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add <a href='037heap.cc.html#L23'>imm32</a> to <a href='010---vm.cc.html#L13'>EAX</a> (add)&quot;</span><span class="Delimiter">);</span>
 <span id="L354" class="LineNr">354 </span>
-<span id="L355" class="LineNr">355 </span><span class="Normal">int32_t</span> <a href='011run.cc.html#L355'>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="L356" class="LineNr">356 </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="L357" class="LineNr">357 </span>  istringstream in<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
-<span id="L358" class="LineNr">358 </span>  in &gt;&gt; std::hex<span class="Delimiter">;</span>
-<span id="L359" class="LineNr">359 </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="L360" class="LineNr">360 </span>    <span class="Normal">int32_t</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L361" class="LineNr">361 </span>    in &gt;&gt; result<span class="Delimiter">;</span>
-<span id="L362" class="LineNr">362 </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="L363" class="LineNr">363 </span>      <a href='003trace.cc.html#L217'>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; end<span class="Delimiter">();</span>
-<span id="L364" class="LineNr">364 </span>      <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L365" class="LineNr">365 </span>    <span class="Delimiter">}</span>
-<span id="L366" class="LineNr">366 </span>    <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L367" class="LineNr">367 </span>  <span class="Delimiter">}</span>
-<span id="L368" class="LineNr">368 </span>  <span class="Normal">uint32_t</span> uresult = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L369" class="LineNr">369 </span>  in &gt;&gt; uresult<span class="Delimiter">;</span>
-<span id="L370" class="LineNr">370 </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="L371" class="LineNr">371 </span>    <a href='003trace.cc.html#L217'>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; end<span class="Delimiter">();</span>
-<span id="L372" class="LineNr">372 </span>    <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L373" class="LineNr">373 </span>  <span class="Delimiter">}</span>
-<span id="L374" class="LineNr">374 </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="L375" class="LineNr">375 </span><span class="Delimiter">}</span>
-<span id="L376" class="LineNr">376 </span><span class="Delimiter">:(before &quot;End Unit Tests&quot;)</span>
-<span id="L377" class="LineNr">377 </span><span class="Normal">void</span> <a href='011run.cc.html#L377'>test_parse_int</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L378" class="LineNr">378 </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#L355'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;0&quot;</span><span class="Delimiter">));</span>
-<span id="L379" class="LineNr">379 </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#L355'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;0x0&quot;</span><span class="Delimiter">));</span>
-<span id="L380" class="LineNr">380 </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#L355'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;0x0&quot;</span><span class="Delimiter">));</span>
-<span id="L381" class="LineNr">381 </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#L355'>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="L382" class="LineNr">382 </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#L355'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;-1&quot;</span><span class="Delimiter">));</span>
-<span id="L383" class="LineNr">383 </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#L355'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;0xffffffff&quot;</span><span class="Delimiter">));</span>
-<span id="L384" class="LineNr">384 </span><span class="Delimiter">}</span>
+<span id="L355" class="LineNr">355 </span><span class="Comment">//: our first opcode</span>
+<span id="L356" class="LineNr">356 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L357" class="LineNr">357 </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="L358" class="LineNr">358 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L366'>next32</a><span class="Delimiter">();</span>
+<span id="L359" class="LineNr">359 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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='037heap.cc.html#L23'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>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; end<span class="Delimiter">();</span>
+<span id="L360" class="LineNr">360 </span>  <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L361" class="LineNr">361 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L362" class="LineNr">362 </span><span class="Delimiter">}</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="Comment">// read a 32-bit int in little-endian order from the instruction stream</span>
+<span id="L366" class="LineNr">366 </span><span class="Normal">int32_t</span> <a href='011run.cc.html#L366'>next32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L367" class="LineNr">367 </span>  <span class="Normal">int32_t</span> result = <a href='010---vm.cc.html#L213'>read_mem_i32</a><span class="Delimiter">(</span>EIP<span class="Delimiter">);</span>
+<span id="L368" class="LineNr">368 </span>  EIP+=<span class="Constant">4</span><span class="Delimiter">;</span>
+<span id="L369" class="LineNr">369 </span>  <span class="Identifier">return</span> result<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="SalientComment">//:: helpers</span>
+<span id="L373" class="LineNr">373 </span>
+<span id="L374" class="LineNr">374 </span>string to_string<span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L375" class="LineNr">375 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L376" class="LineNr">376 </span>  out &lt;&lt; w<span class="Delimiter">.</span>data<span class="Delimiter">;</span>
+<span id="L377" class="LineNr">377 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L378" class="LineNr">378 </span>    out &lt;&lt; <span class="Constant">&quot; /&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L379" class="LineNr">379 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<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">int32_t</span> <a href='011run.cc.html#L382'>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="L383" class="LineNr">383 </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="L384" class="LineNr">384 </span>  istringstream in<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
+<span id="L385" class="LineNr">385 </span>  in &gt;&gt; std::hex<span class="Delimiter">;</span>
+<span id="L386" class="LineNr">386 </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="L387" class="LineNr">387 </span>    <span class="Normal">int32_t</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L388" class="LineNr">388 </span>    in &gt;&gt; result<span class="Delimiter">;</span>
+<span id="L389" class="LineNr">389 </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="L390" class="LineNr">390 </span>      <a href='003trace.cc.html#L202'>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; end<span class="Delimiter">();</span>
+<span id="L391" class="LineNr">391 </span>      <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L392" class="LineNr">392 </span>    <span class="Delimiter">}</span>
+<span id="L393" class="LineNr">393 </span>    <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L394" class="LineNr">394 </span>  <span class="Delimiter">}</span>
+<span id="L395" class="LineNr">395 </span>  <span class="Normal">uint32_t</span> uresult = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L396" class="LineNr">396 </span>  in &gt;&gt; uresult<span class="Delimiter">;</span>
+<span id="L397" class="LineNr">397 </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="L398" class="LineNr">398 </span>    <a href='003trace.cc.html#L202'>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; end<span class="Delimiter">();</span>
+<span id="L399" class="LineNr">399 </span>    <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L400" class="LineNr">400 </span>  <span class="Delimiter">}</span>
+<span id="L401" class="LineNr">401 </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="L402" class="LineNr">402 </span><span class="Delimiter">}</span>
+<span id="L403" class="LineNr">403 </span><span class="Delimiter">:(before &quot;End Unit Tests&quot;)</span>
+<span id="L404" class="LineNr">404 </span><span class="Normal">void</span> <a href='011run.cc.html#L404'>test_parse_int</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L405" class="LineNr">405 </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#L382'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;0&quot;</span><span class="Delimiter">));</span>
+<span id="L406" class="LineNr">406 </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#L382'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;0x0&quot;</span><span class="Delimiter">));</span>
+<span id="L407" class="LineNr">407 </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#L382'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;0x0&quot;</span><span class="Delimiter">));</span>
+<span id="L408" class="LineNr">408 </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#L382'>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="L409" class="LineNr">409 </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#L382'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;-1&quot;</span><span class="Delimiter">));</span>
+<span id="L410" class="LineNr">410 </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#L382'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;0xffffffff&quot;</span><span class="Delimiter">));</span>
+<span id="L411" class="LineNr">411 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/012elf.cc.html b/html/subx/012elf.cc.html
index bb69ca45..99cf31ca 100644
--- a/html/subx/012elf.cc.html
+++ b/html/subx/012elf.cc.html
@@ -15,6 +15,7 @@ body { font-size:12pt; font-family: monospace; color: #000000; background-color:
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
 .CommentedCode { color: #8a8a8a; }
+.PreProc { color: #c000c0; }
 .LineNr { }
 .Constant { color: #008787; }
 .Delimiter { color: #c000c0; }
@@ -65,28 +66,28 @@ if ('onhashchange' in window) {
 <span id="L5" class="LineNr">  5 </span><span class="Delimiter">:(before &quot;End Main&quot;)</span>
 <span id="L6" class="LineNr">  6 </span>assert<span class="Delimiter">(</span>argc &gt; <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L7" class="LineNr">  7 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L98'>is_equal</a><span class="Delimiter">(</span>argv[<span class="Constant">1</span>]<span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L8" class="LineNr">  8 </span>  <a href='003trace.cc.html#L197'>START_TRACING_UNTIL_END_OF_SCOPE</a><span class="Delimiter">;</span>
-<span id="L9" class="LineNr">  9 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;=== Starting to run&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L8" class="LineNr">  8 </span>  <a href='003trace.cc.html#L182'>START_TRACING_UNTIL_END_OF_SCOPE</a><span class="Delimiter">;</span>
+<span id="L9" class="LineNr">  9 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;=== Starting to run&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L10" class="LineNr"> 10 </span>  assert<span class="Delimiter">(</span>argc &gt; <span class="Constant">2</span><span class="Delimiter">);</span>
 <span id="L11" class="LineNr"> 11 </span>  <a href='000organization.cc.html#L148'>reset</a><span class="Delimiter">();</span>
 <span id="L12" class="LineNr"> 12 </span>  cerr &lt;&lt; std::hex<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>EIP &lt; <span class="Special"><a href='010---vm.cc.html#L194'>End_of_program</a></span><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#L296'>run_one_instruction</a><span class="Delimiter">();</span>
-<span id="L16" class="LineNr"> 16 </span>  <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;executed past end of the world: &quot;</span> &lt;&lt; EIP &lt;&lt; <span class="Constant">&quot; vs &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L194'>End_of_program</a></span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L16" class="LineNr"> 16 </span>  <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;executed past end of the world: &quot;</span> &lt;&lt; EIP &lt;&lt; <span class="Constant">&quot; vs &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L194'>End_of_program</a></span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L17" class="LineNr"> 17 </span>  <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
 <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="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#L217'>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#L163'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L172'>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#L202'>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#L163'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L172'>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#L217'>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#L163'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L172'>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#L202'>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#L163'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L172'>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#L217'>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#L163'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L172'>die</a><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#L202'>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#L163'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L172'>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>
@@ -95,25 +96,25 @@ if ('onhashchange' in window) {
 <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;\177ELF&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#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid ELF file; starts with \&quot;&quot; &lt;&lt; magic &lt;&lt; '&quot;</span>' &lt;&lt; <a href='012elf.cc.html#L172'>die</a><span class="Delimiter">();</span>
+<span id="L38" class="LineNr"> 38 </span>    <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid ELF file; starts with \&quot;&quot; &lt;&lt; magic &lt;&lt; '&quot;</span>' &lt;&lt; <a href='012elf.cc.html#L172'>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#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;Only 32-bit ELF files (4-byte words; virtual addresses up to 4GB) supported.\n&quot;</span> &lt;&lt; <a href='012elf.cc.html#L172'>die</a><span class="Delimiter">();</span>
+<span id="L40" class="LineNr"> 40 </span>    <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;Only 32-bit ELF files (4-byte words; virtual addresses up to 4GB) supported.\n&quot;</span> &lt;&lt; <a href='012elf.cc.html#L172'>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#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;Only little-endian ELF files supported.\n&quot;</span> &lt;&lt; <a href='012elf.cc.html#L172'>die</a><span class="Delimiter">();</span>
+<span id="L42" class="LineNr"> 42 </span>    <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;Only little-endian ELF files supported.\n&quot;</span> &lt;&lt; <a href='012elf.cc.html#L172'>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#L154'>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#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;ELF type/machine 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; e_machine_type &lt;&lt; <span class="Constant">&quot; isn't i386 executable\n&quot;</span> &lt;&lt; die<span class="Delimiter">();</span>
+<span id="L46" class="LineNr"> 46 </span>    <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;ELF type/machine 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; e_machine_type &lt;&lt; <span class="Constant">&quot; isn't i386 executable\n&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> <a href='035labels.cc.html#L39'>e_entry</a> = <a href='012elf.cc.html#L154'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">24</span>]<span class="Delimiter">);</span>
+<span id="L48" class="LineNr"> 48 </span>  <span class="Normal">uint32_t</span> <a href='035labels.cc.html#L44'>e_entry</a> = <a href='012elf.cc.html#L154'>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#L154'>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#L158'>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#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; ELF header too small\n&quot;</span> &lt;&lt; <a href='012elf.cc.html#L172'>die</a><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#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; ELF header too small\n&quot;</span> &lt;&lt; <a href='012elf.cc.html#L172'>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#L158'>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#L158'>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#L98'>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#L95'>program</a> header, each &quot;</span> &lt;&lt; e_phentsize &lt;&lt; <span class="Constant">&quot; bytes long&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L56" class="LineNr"> 56 </span>  <a href='003trace.cc.html#L96'>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#L102'>program</a> header, each &quot;</span> &lt;&lt; e_phentsize &lt;&lt; <span class="Constant">&quot; bytes long&quot;</span> &lt;&lt; end<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>
@@ -128,7 +129,7 @@ if ('onhashchange' in window) {
 <span id="L68" class="LineNr"> 68 </span>  assert<span class="Delimiter">(</span>overlap<span class="Delimiter">.</span>find<span class="Delimiter">(</span><a href='012elf.cc.html#L139'>AFTER_STACK</a><span class="Delimiter">)</span> == overlap<span class="Delimiter">.</span>end<span class="Delimiter">());</span>
 <span id="L69" class="LineNr"> 69 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u = <a href='012elf.cc.html#L139'>AFTER_STACK</a><span class="Delimiter">;</span>
 <span id="L70" class="LineNr"> 70 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBP]<span class="Delimiter">.</span>u = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L71" class="LineNr"> 71 </span>  EIP = <a href='035labels.cc.html#L39'>e_entry</a><span class="Delimiter">;</span>
+<span id="L71" class="LineNr"> 71 </span>  EIP = <a href='035labels.cc.html#L44'>e_entry</a><span class="Delimiter">;</span>
 <span id="L72" class="LineNr"> 72 </span>
 <span id="L73" class="LineNr"> 73 </span>  <span class="Comment">// initialize args on stack</span>
 <span id="L74" class="LineNr"> 74 </span>  <span class="Comment">// no envp for now</span>
@@ -149,34 +150,34 @@ if ('onhashchange' in window) {
 <span id="L89" class="LineNr"> 89 </span>
 <span id="L90" class="LineNr"> 90 </span><span class="Normal">void</span> <a href='012elf.cc.html#L90'>push</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L91" class="LineNr"> 91 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u -= <span class="Constant">4</span><span class="Delimiter">;</span>
-<span id="L92" class="LineNr"> 92 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L433'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L93" class="LineNr"> 93 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L433'>HEXWORD</a> &lt;&lt; val &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L92" class="LineNr"> 92 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L440'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L93" class="LineNr"> 93 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L440'>HEXWORD</a> &lt;&lt; val &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L94" class="LineNr"> 94 </span>  <a href='010---vm.cc.html#L271'>write_mem_u32</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> val<span class="Delimiter">);</span>
 <span id="L95" class="LineNr"> 95 </span><span class="Delimiter">}</span>
 <span id="L96" class="LineNr"> 96 </span>
-<span id="L97" class="LineNr"> 97 </span><span class="Normal">void</span> <a href='012elf.cc.html#L97'>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">int</span> segment_index<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> set&lt;<span class="Normal">uint32_t</span>&gt;&amp; overlap<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L97" class="LineNr"> 97 </span><span class="Normal">void</span> <a href='012elf.cc.html#L97'>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">int</span> segment_index<span class="Delimiter">,</span> <span class="Normal">size_t</span> size<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> <a href='039debug.cc.html#L30'>offset</a><span class="Delimiter">,</span> <span class="Normal">uint32_t</span> e_ehsize<span class="Delimiter">,</span> set&lt;<span class="Normal">uint32_t</span>&gt;&amp; overlap<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L98" class="LineNr"> 98 </span>  <span class="Normal">uint32_t</span> p_type = <a href='012elf.cc.html#L154'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset]<span class="Delimiter">);</span>
-<span id="L99" class="LineNr"> 99 </span>  <a href='003trace.cc.html#L98'>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; end<span class="Delimiter">();</span>
+<span id="L99" class="LineNr"> 99 </span>  <a href='003trace.cc.html#L96'>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 <a href='039debug.cc.html#L30'>offset</a> &quot;</span> &lt;&lt; <a href='039debug.cc.html#L30'>offset</a> &lt;&lt; <span class="Constant">&quot;: type &quot;</span> &lt;&lt; p_type &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L100" class="LineNr">100 </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="L101" class="LineNr">101 </span>    <a href='003trace.cc.html#L98'>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="L101" class="LineNr">101 </span>    <a href='003trace.cc.html#L96'>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 <a href='039debug.cc.html#L30'>offset</a> &quot;</span> &lt;&lt; <a href='039debug.cc.html#L30'>offset</a> &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="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">uint32_t</span> p_offset = <a href='012elf.cc.html#L154'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">4</span>]<span class="Delimiter">);</span>
 <span id="L105" class="LineNr">105 </span>  <span class="Normal">uint32_t</span> p_vaddr = <a href='012elf.cc.html#L154'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">8</span>]<span class="Delimiter">);</span>
-<span id="L106" class="LineNr">106 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>e_ehsize &gt; p_vaddr<span class="Delimiter">)</span> <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; <a href='011run.cc.html#L95'>program</a> header overlaps ELF header\n&quot;</span> &lt;&lt; <a href='012elf.cc.html#L172'>die</a><span class="Delimiter">();</span>
+<span id="L106" class="LineNr">106 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>e_ehsize &gt; p_vaddr<span class="Delimiter">)</span> <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; <a href='011run.cc.html#L102'>program</a> header overlaps ELF header\n&quot;</span> &lt;&lt; <a href='012elf.cc.html#L172'>die</a><span class="Delimiter">();</span>
 <span id="L107" class="LineNr">107 </span>  <span class="Comment">// unused: p_paddr</span>
 <span id="L108" class="LineNr">108 </span>  <span class="Normal">uint32_t</span> p_filesz = <a href='012elf.cc.html#L154'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">16</span>]<span class="Delimiter">);</span>
 <span id="L109" class="LineNr">109 </span>  <span class="Normal">uint32_t</span> p_memsz = <a href='012elf.cc.html#L154'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">20</span>]<span class="Delimiter">);</span>
 <span id="L110" class="LineNr">110 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p_filesz != p_memsz<span class="Delimiter">)</span>
-<span id="L111" class="LineNr">111 </span>    <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;Can't yet 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>)\n&quot;</span> &lt;&lt; die<span class="Delimiter">();</span>
+<span id="L111" class="LineNr">111 </span>    <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;Can't yet 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>)\n&quot;</span> &lt;&lt; die<span class="Delimiter">();</span>
 <span id="L112" class="LineNr">112 </span>
 <span id="L113" class="LineNr">113 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p_offset + p_filesz &gt; size<span class="Delimiter">)</span>
-<span id="L114" class="LineNr">114 </span>    <a href='003trace.cc.html#L217'>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 end 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#L172'>die</a><span class="Delimiter">();</span>
+<span id="L114" class="LineNr">114 </span>    <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; segment at <a href='039debug.cc.html#L30'>offset</a> &quot;</span> &lt;&lt; <a href='039debug.cc.html#L30'>offset</a> &lt;&lt; <span class="Constant">&quot; is too large: wants to end 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#L172'>die</a><span class="Delimiter">();</span>
 <span id="L115" class="LineNr">115 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p_memsz &gt;= <a href='010---vm.cc.html#L115'>SEGMENT_ALIGNMENT</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L116" class="LineNr">116 </span>    <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;Code segment too small for SubX; for now please manually increase SEGMENT_ALIGNMENT.\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L116" class="LineNr">116 </span>    <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;Code segment too small for SubX; for now please manually increase SEGMENT_ALIGNMENT.\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L117" class="LineNr">117 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L118" class="LineNr">118 </span>  <span class="Delimiter">}</span>
-<span id="L119" class="LineNr">119 </span>  <a href='003trace.cc.html#L98'>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; end<span class="Delimiter">();</span>
+<span id="L119" class="LineNr">119 </span>  <a href='003trace.cc.html#L96'>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; end<span class="Delimiter">();</span>
 <span id="L120" class="LineNr">120 </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="L121" class="LineNr">121 </span>  <span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>vma<span class="Delimiter">(</span>p_vaddr<span class="Delimiter">));</span>
 <span id="L122" class="LineNr">122 </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 class="Delimiter">{</span>
@@ -203,12 +204,12 @@ if ('onhashchange' in window) {
 <span id="L143" class="LineNr">143 </span><span class="Delimiter">:(code)</span>
 <span id="L144" class="LineNr">144 </span><span class="Normal">void</span> <a href='012elf.cc.html#L144'>dump_stack</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
 <span id="L145" class="LineNr">145 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L146" class="LineNr">146 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;stack:&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L146" class="LineNr">146 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;stack:&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L147" class="LineNr">147 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">uint32_t</span> a = AFTER_STACK-<span class="Constant">4</span><span class="Delimiter">;</span>  a &gt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>  a -= <span class="Constant">4</span><span class="Delimiter">)</span>
-<span id="L148" class="LineNr">148 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; a &lt;&lt; <span class="Constant">&quot; =&gt; 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L209'>read_mem_u32</a><span class="Delimiter">(</span>a<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L149" class="LineNr">149 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L209'>read_mem_u32</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  &lt;=== ESP&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L148" class="LineNr">148 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; a &lt;&lt; <span class="Constant">&quot; =&gt; 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L209'>read_mem_u32</a><span class="Delimiter">(</span>a<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L149" class="LineNr">149 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L209'>read_mem_u32</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  &lt;=== ESP&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L150" class="LineNr">150 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">uint32_t</span> a = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u-<span class="Constant">4</span><span class="Delimiter">;</span>  a &gt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u-<span class="Constant">40</span><span class="Delimiter">;</span>  a -= <span class="Constant">4</span><span class="Delimiter">)</span>
-<span id="L151" class="LineNr">151 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; a &lt;&lt; <span class="Constant">&quot; =&gt; 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L209'>read_mem_u32</a><span class="Delimiter">(</span>a<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L151" class="LineNr">151 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; a &lt;&lt; <span class="Constant">&quot; =&gt; 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L209'>read_mem_u32</a><span class="Delimiter">(</span>a<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L152" class="LineNr">152 </span><span class="Delimiter">}</span>
 <span id="L153" class="LineNr">153 </span>
 <span id="L154" class="LineNr">154 </span><span class="Normal">inline</span> <span class="Normal">uint32_t</span> <a href='012elf.cc.html#L154'>u32_in</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -232,17 +233,17 @@ if ('onhashchange' in window) {
 <span id="L172" class="LineNr">172 </span><span class="Normal">struct</span> <a href='012elf.cc.html#L172'>die</a> <span class="Delimiter">{};</span>
 <span id="L173" class="LineNr">173 </span><span class="Delimiter">:(code)</span>
 <span id="L174" class="LineNr">174 </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#L172'>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="L175" class="LineNr">175 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='003trace.cc.html#L74'>Trace_stream</a></span><span class="Delimiter">)</span> <span class="Special"><a href='003trace.cc.html#L74'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L173'>newline</a><span class="Delimiter">();</span>
+<span id="L175" class="LineNr">175 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='003trace.cc.html#L72'>Trace_stream</a></span><span class="Delimiter">)</span> <span class="Special"><a href='003trace.cc.html#L72'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L159'>newline</a><span class="Delimiter">();</span>
 <span id="L176" class="LineNr">176 </span>  exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L177" class="LineNr">177 </span><span class="Delimiter">}</span>
 <span id="L178" class="LineNr">178 </span>
 <span id="L179" class="LineNr">179 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L180" class="LineNr">180 </span><span class="Comment">#include &lt;sys/types.h&gt;</span>
-<span id="L181" class="LineNr">181 </span><span class="Comment">#include &lt;sys/stat.h&gt;</span>
-<span id="L182" class="LineNr">182 </span><span class="Comment">#include &lt;fcntl.h&gt;</span>
-<span id="L183" class="LineNr">183 </span><span class="Comment">#include &lt;stdarg.h&gt;</span>
-<span id="L184" class="LineNr">184 </span><span class="Comment">#include &lt;errno.h&gt;</span>
-<span id="L185" class="LineNr">185 </span><span class="Comment">#include &lt;unistd.h&gt;</span>
+<span id="L180" class="LineNr">180 </span><span class="PreProc">#include </span><span class="Constant">&lt;sys/types.h&gt;</span>
+<span id="L181" class="LineNr">181 </span><span class="PreProc">#include </span><span class="Constant">&lt;sys/stat.h&gt;</span>
+<span id="L182" class="LineNr">182 </span><span class="PreProc">#include </span><span class="Constant">&lt;fcntl.h&gt;</span>
+<span id="L183" class="LineNr">183 </span><span class="PreProc">#include </span><span class="Constant">&lt;stdarg.h&gt;</span>
+<span id="L184" class="LineNr">184 </span><span class="PreProc">#include </span><span class="Constant">&lt;errno.h&gt;</span>
+<span id="L185" class="LineNr">185 </span><span class="PreProc">#include </span><span class="Constant">&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 d1745bdb..13d1698a 100644
--- a/html/subx/013direct_addressing.cc.html
+++ b/html/subx/013direct_addressing.cc.html
@@ -14,9 +14,7 @@ pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-
 body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
-.traceContains { color: #005f00; }
-.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
+.CommentedCode { color: #8a8a8a; }
 .LineNr { }
 .Constant { color: #008787; }
 .SalientComment { color: #0000af; }
@@ -25,8 +23,7 @@ a { color:inherit; }
 .Identifier { color: #af5f00; }
 .Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 .Comment { color: #005faf; }
-.CommentedCode { color: #8a8a8a; }
-.PreProc { color: #c000c0; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
@@ -65,798 +62,969 @@ if ('onhashchange' in window) {
 <span id="L1" class="LineNr">  1 </span><span class="Comment">//: operating directly on a register</span>
 <span id="L2" class="LineNr">  2 </span>
 <span id="L3" class="LineNr">  3 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L4" class="LineNr">  4 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;01&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add r32 to rm32 (add)&quot;</span><span class="Delimiter">);</span>
+<span id="L4" class="LineNr">  4 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;01&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add r32 to rm32 (add)&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_r32_to_r32)</span>
-<span id="L7" class="LineNr">  7 </span><span class="Special">% Reg[EAX].i = 0x10;</span>
-<span id="L8" class="LineNr">  8 </span><span class="Special">% Reg[EBX].i = 1;</span>
-<span id="L9" class="LineNr">  9 </span>== <span class="Constant">0x1</span>
-<span id="L10" class="LineNr"> 10 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L11" class="LineNr"> 11 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  d8                                      <span class="Comment"># add EBX to EAX</span>
-<span id="L12" class="LineNr"> 12 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L13" class="LineNr"> 13 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L14" class="LineNr"> 14 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L15" class="LineNr"> 15 </span><span class="traceContains">+run: storing 0x00000011</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">0x01</span>: <span class="Delimiter">{</span>  <span class="Comment">// add r32 to r/m32</span>
-<span id="L19" class="LineNr"> 19 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L20" class="LineNr"> 20 </span>  <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L63'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to r/m32&quot;</span> &lt;&lt; end<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>  <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">);</span>
-<span id="L24" class="LineNr"> 24 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L25" class="LineNr"> 25 </span><span class="Delimiter">}</span>
-<span id="L26" class="LineNr"> 26 </span>
-<span id="L27" class="LineNr"> 27 </span><span class="Delimiter">:(code)</span>
-<span id="L28" class="LineNr"> 28 </span><span class="Comment">// Implement tables 2-2 and 2-3 in the Intel manual, Volume 2.</span>
-<span id="L29" class="LineNr"> 29 </span><span class="Comment">// We return a pointer so that instructions can write to multiple bytes in</span>
-<span id="L30" class="LineNr"> 30 </span><span class="Comment">// 'Mem' at once.</span>
-<span id="L31" class="LineNr"> 31 </span><span class="Normal">int32_t</span>* <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> modrm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L32" class="LineNr"> 32 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> mod = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">6</span><span class="Delimiter">);</span>
-<span id="L33" class="LineNr"> 33 </span>  <span class="Comment">// ignore middle 3 'reg opcode' bits</span>
-<span id="L34" class="LineNr"> 34 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> rm = modrm &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L35" class="LineNr"> 35 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>mod == <span class="Constant">3</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L36" class="LineNr"> 36 </span>    <span class="Comment">// mod 3 is just register direct addressing</span>
-<span id="L37" class="LineNr"> 37 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;r/m32 is &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L63'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L38" class="LineNr"> 38 </span>    <span class="Identifier">return</span> &amp;<span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rm]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L39" class="LineNr"> 39 </span>  <span class="Delimiter">}</span>
-<span id="L40" class="LineNr"> 40 </span>  <span class="Identifier">return</span> <a href='010---vm.cc.html#L248'>mem_addr_i32</a><span class="Delimiter">(</span><a href='013direct_addressing.cc.html#L43'>effective_address_number</a><span class="Delimiter">(</span>modrm<span class="Delimiter">));</span>
-<span id="L41" class="LineNr"> 41 </span><span class="Delimiter">}</span>
-<span id="L42" class="LineNr"> 42 </span>
-<span id="L43" class="LineNr"> 43 </span><span class="Normal">uint32_t</span> <a href='013direct_addressing.cc.html#L43'>effective_address_number</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> modrm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L44" class="LineNr"> 44 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> mod = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">6</span><span class="Delimiter">);</span>
-<span id="L45" class="LineNr"> 45 </span>  <span class="Comment">// ignore middle 3 'reg opcode' bits</span>
-<span id="L46" class="LineNr"> 46 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> rm = modrm &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L47" class="LineNr"> 47 </span>  <span class="Normal">uint32_t</span> addr = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L48" class="LineNr"> 48 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>mod<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L49" class="LineNr"> 49 </span>  <span class="Normal">case</span> <span class="Constant">3</span>:
-<span id="L50" class="LineNr"> 50 </span>    <span class="Comment">// mod 3 is just register direct addressing</span>
-<span id="L51" class="LineNr"> 51 </span>    <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;unexpected direct addressing mode\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L52" class="LineNr"> 52 </span>    <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L53" class="LineNr"> 53 </span>  <span class="Comment">// End Mod Special-cases(addr)</span>
-<span id="L54" class="LineNr"> 54 </span>  <span class="Normal">default</span>:
-<span id="L55" class="LineNr"> 55 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized mod bits: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>mod<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L56" class="LineNr"> 56 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</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="Comment">//: other mods are indirect, and they'll set addr appropriately</span>
-<span id="L59" class="LineNr"> 59 </span>  <span class="Comment">// Found effective_address(addr)</span>
-<span id="L60" class="LineNr"> 60 </span>  <span class="Identifier">return</span> addr<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>string <a href='013direct_addressing.cc.html#L63'>rname</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L64" class="LineNr"> 64 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L65" class="LineNr"> 65 </span>  <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Identifier">return</span> <span class="Constant">&quot;EAX&quot;</span><span class="Delimiter">;</span>
-<span id="L66" class="LineNr"> 66 </span>  <span class="Normal">case</span> <span class="Constant">1</span>: <span class="Identifier">return</span> <span class="Constant">&quot;ECX&quot;</span><span class="Delimiter">;</span>
-<span id="L67" class="LineNr"> 67 </span>  <span class="Normal">case</span> <span class="Constant">2</span>: <span class="Identifier">return</span> <span class="Constant">&quot;EDX&quot;</span><span class="Delimiter">;</span>
-<span id="L68" class="LineNr"> 68 </span>  <span class="Normal">case</span> <span class="Constant">3</span>: <span class="Identifier">return</span> <span class="Constant">&quot;EBX&quot;</span><span class="Delimiter">;</span>
-<span id="L69" class="LineNr"> 69 </span>  <span class="Normal">case</span> <span class="Constant">4</span>: <span class="Identifier">return</span> <span class="Constant">&quot;ESP&quot;</span><span class="Delimiter">;</span>
-<span id="L70" class="LineNr"> 70 </span>  <span class="Normal">case</span> <span class="Constant">5</span>: <span class="Identifier">return</span> <span class="Constant">&quot;EBP&quot;</span><span class="Delimiter">;</span>
-<span id="L71" class="LineNr"> 71 </span>  <span class="Normal">case</span> <span class="Constant">6</span>: <span class="Identifier">return</span> <span class="Constant">&quot;ESI&quot;</span><span class="Delimiter">;</span>
-<span id="L72" class="LineNr"> 72 </span>  <span class="Normal">case</span> <span class="Constant">7</span>: <span class="Identifier">return</span> <span class="Constant">&quot;EDI&quot;</span><span class="Delimiter">;</span>
-<span id="L73" class="LineNr"> 73 </span>  <span class="Normal">default</span>: <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid register &quot;</span> &lt;&lt; r &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>  <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L74" class="LineNr"> 74 </span>  <span class="Delimiter">}</span>
-<span id="L75" class="LineNr"> 75 </span><span class="Delimiter">}</span>
-<span id="L76" class="LineNr"> 76 </span>
-<span id="L77" class="LineNr"> 77 </span><span class="SalientComment">//:: subtract</span>
-<span id="L78" class="LineNr"> 78 </span>
-<span id="L79" class="LineNr"> 79 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L80" class="LineNr"> 80 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;29&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract r32 from rm32 (sub)&quot;</span><span class="Delimiter">);</span>
-<span id="L81" class="LineNr"> 81 </span>
-<span id="L82" class="LineNr"> 82 </span><span class="Delimiter">:(scenario subtract_r32_from_r32)</span>
-<span id="L83" class="LineNr"> 83 </span><span class="Special">% Reg[EAX].i = 10;</span>
-<span id="L84" class="LineNr"> 84 </span><span class="Special">% Reg[EBX].i = 1;</span>
-<span id="L85" class="LineNr"> 85 </span>== <span class="Constant">0x1</span>
-<span id="L86" class="LineNr"> 86 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L87" class="LineNr"> 87 </span>  <span class="Constant">29</span>  d8                                      <span class="Comment"># subtract EBX from EAX</span>
-<span id="L88" class="LineNr"> 88 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L89" class="LineNr"> 89 </span><span class="traceContains">+run: subtract <a href='010---vm.cc.html#L16'>EBX</a> from r/m32</span>
-<span id="L90" class="LineNr"> 90 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L91" class="LineNr"> 91 </span><span class="traceContains">+run: storing 0x00000009</span>
-<span id="L92" class="LineNr"> 92 </span>
-<span id="L93" class="LineNr"> 93 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L94" class="LineNr"> 94 </span><span class="Normal">case</span> <span class="Constant">0x29</span>: <span class="Delimiter">{</span>  <span class="Comment">// subtract r32 from r/m32</span>
-<span id="L95" class="LineNr"> 95 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L96" class="LineNr"> 96 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L97" class="LineNr"> 97 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L63'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; from r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L98" class="LineNr"> 98 </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="L99" class="LineNr"> 99 </span>  <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">);</span>
-<span id="L100" class="LineNr">100 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L101" class="LineNr">101 </span><span class="Delimiter">}</span>
-<span id="L102" class="LineNr">102 </span>
-<span id="L103" class="LineNr">103 </span><span class="SalientComment">//:: multiply</span>
-<span id="L104" class="LineNr">104 </span>
-<span id="L105" class="LineNr">105 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L106" class="LineNr">106 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;f7&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;negate/multiply rm32 (with <a href='010---vm.cc.html#L13'>EAX</a> if necessary) depending on subop (neg/mul)&quot;</span><span class="Delimiter">);</span>
-<span id="L107" class="LineNr">107 </span>
-<span id="L108" class="LineNr">108 </span><span class="Delimiter">:(scenario multiply_eax_by_r32)</span>
-<span id="L109" class="LineNr">109 </span><span class="Special">% Reg[EAX].i = 4;</span>
-<span id="L110" class="LineNr">110 </span><span class="Special">% Reg[ECX].i = 3;</span>
-<span id="L111" class="LineNr">111 </span>== <span class="Constant">0x1</span>
-<span id="L112" class="LineNr">112 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
-<span id="L113" class="LineNr">113 </span>  f7      e1                                      <span class="Comment"># multiply EAX by ECX</span>
-<span id="L114" class="LineNr">114 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 100 (subop mul) 001 (src ECX)</span>
-<span id="L115" class="LineNr">115 </span><span class="traceContains">+run: operate on r/m32</span>
-<span id="L116" class="LineNr">116 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L14'>ECX</a></span>
-<span id="L117" class="LineNr">117 </span><span class="traceContains">+run: subop: multiply <a href='010---vm.cc.html#L13'>EAX</a> by r/m32</span>
-<span id="L118" class="LineNr">118 </span><span class="traceContains">+run: storing 0x0000000c</span>
-<span id="L119" class="LineNr">119 </span>
-<span id="L120" class="LineNr">120 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L121" class="LineNr">121 </span><span class="Normal">case</span> <span class="Constant">0xf7</span>: <span class="Delimiter">{</span>
-<span id="L122" class="LineNr">122 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L123" class="LineNr">123 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;operate on r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L124" class="LineNr">124 </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="L125" class="LineNr">125 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
-<span id="L126" class="LineNr">126 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L127" class="LineNr">127 </span>  <span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>  <span class="Comment">// mul unsigned EAX by r/m32</span>
-<span id="L128" class="LineNr">128 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: multiply <a href='010---vm.cc.html#L13'>EAX</a> by r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L129" class="LineNr">129 </span>    <span class="Normal">const</span> <span class="Normal">uint64_t</span> result = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>u * <span class="Normal">static_cast</span>&lt;<span class="Normal">uint32_t</span>&gt;<span class="Delimiter">(</span>*arg1<span class="Delimiter">);</span>
-<span id="L130" class="LineNr">130 </span>    <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>u = result &amp; <span class="Constant">0xffffffff</span><span class="Delimiter">;</span>
-<span id="L131" class="LineNr">131 </span>    <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EDX]<span class="Delimiter">.</span>u = result &gt;&gt; <span class="Constant">32</span><span class="Delimiter">;</span>
-<span id="L132" class="LineNr">132 </span>    <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EDX]<span class="Delimiter">.</span>u != <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L133" class="LineNr">133 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L433'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L134" class="LineNr">134 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L135" class="LineNr">135 </span>  <span class="Delimiter">}</span>
-<span id="L136" class="LineNr">136 </span>  <span class="Comment">// End Op f7 Subops</span>
-<span id="L137" class="LineNr">137 </span>  <span class="Normal">default</span>:
-<span id="L138" class="LineNr">138 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized subop for opcode f7: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L139" class="LineNr">139 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L140" class="LineNr">140 </span>  <span class="Delimiter">}</span>
-<span id="L141" class="LineNr">141 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L142" class="LineNr">142 </span><span class="Delimiter">}</span>
-<span id="L143" class="LineNr">143 </span>
-<span id="L144" class="LineNr">144 </span><span class="Comment">//:</span>
-<span id="L145" class="LineNr">145 </span>
-<span id="L146" class="LineNr">146 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L147" class="LineNr">147 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L381'>Name_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;af&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;multiply rm32 into r32 (imul)&quot;</span><span class="Delimiter">);</span>
-<span id="L148" class="LineNr">148 </span>
-<span id="L149" class="LineNr">149 </span><span class="Delimiter">:(scenario multiply_r32_into_r32)</span>
-<span id="L150" class="LineNr">150 </span><span class="Special">% Reg[EAX].i = 4;</span>
-<span id="L151" class="LineNr">151 </span><span class="Special">% Reg[EBX].i = 2;</span>
-<span id="L152" class="LineNr">152 </span>== <span class="Constant">0x1</span>
-<span id="L153" class="LineNr">153 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
-<span id="L154" class="LineNr">154 </span>  <span class="Constant">0f</span> af   d8                                      <span class="Comment"># subtract EBX into EAX</span>
-<span id="L155" class="LineNr">155 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L156" class="LineNr">156 </span><span class="traceContains">+run: multiply r/m32 into <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L157" class="LineNr">157 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L158" class="LineNr">158 </span><span class="traceContains">+run: storing 0x00000008</span>
-<span id="L159" class="LineNr">159 </span>
-<span id="L160" class="LineNr">160 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
-<span id="L161" class="LineNr">161 </span><span class="Normal">case</span> <span class="Constant">0xaf</span>: <span class="Delimiter">{</span>  <span class="Comment">// multiply r32 into r/m32</span>
-<span id="L162" class="LineNr">162 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L163" class="LineNr">163 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L164" class="LineNr">164 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;multiply r/m32 into &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L63'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L165" class="LineNr">165 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L166" class="LineNr">166 </span>  <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>*<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> *arg1<span class="Delimiter">);</span>
-<span id="L167" class="LineNr">167 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L168" class="LineNr">168 </span><span class="Delimiter">}</span>
-<span id="L169" class="LineNr">169 </span>
-<span id="L170" class="LineNr">170 </span><span class="SalientComment">//:: negate</span>
-<span id="L171" class="LineNr">171 </span>
-<span id="L172" class="LineNr">172 </span><span class="Delimiter">:(scenario negate_r32)</span>
-<span id="L173" class="LineNr">173 </span><span class="Special">% Reg[EBX].i = 1;</span>
-<span id="L174" class="LineNr">174 </span>== <span class="Constant">0x1</span>
-<span id="L175" class="LineNr">175 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L176" class="LineNr">176 </span>  f7  db                                      <span class="Comment"># negate EBX</span>
-<span id="L177" class="LineNr">177 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (subop negate) 011 (dest EBX)</span>
-<span id="L178" class="LineNr">178 </span><span class="traceContains">+run: operate on r/m32</span>
-<span id="L179" class="LineNr">179 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L180" class="LineNr">180 </span><span class="traceContains">+run: subop: negate</span>
-<span id="L181" class="LineNr">181 </span><span class="traceContains">+run: storing 0xffffffff</span>
-<span id="L182" class="LineNr">182 </span>
-<span id="L183" class="LineNr">183 </span><span class="Delimiter">:(before &quot;End Op f7 Subops&quot;)</span>
-<span id="L184" class="LineNr">184 </span><span class="Normal">case</span> <span class="Constant">3</span>: <span class="Delimiter">{</span>  <span class="Comment">// negate r/m32</span>
-<span id="L185" class="LineNr">185 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: negate&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L186" class="LineNr">186 </span>  <span class="Comment">// one case that can overflow</span>
-<span id="L187" class="LineNr">187 </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>*arg1<span class="Delimiter">)</span> == <span class="Constant">0x80000000</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L188" class="LineNr">188 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;overflow&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L189" class="LineNr">189 </span>    SF =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L190" class="LineNr">190 </span>    ZF =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L191" class="LineNr">191 </span>    <a href='010---vm.cc.html#L81'>OF</a> =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L192" class="LineNr">192 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L193" class="LineNr">193 </span>  <span class="Delimiter">}</span>
-<span id="L194" class="LineNr">194 </span>  *arg1 = -<span class="Delimiter">(</span>*arg1<span class="Delimiter">);</span>
-<span id="L195" class="LineNr">195 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L433'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L196" class="LineNr">196 </span>  SF = <span class="Delimiter">(</span>*arg1 &gt;&gt; <span class="Constant">31</span><span class="Delimiter">);</span>
-<span id="L197" class="LineNr">197 </span>  ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L198" class="LineNr">198 </span>  <a href='010---vm.cc.html#L81'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L199" class="LineNr">199 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L200" class="LineNr">200 </span><span class="Delimiter">}</span>
-<span id="L201" class="LineNr">201 </span>
-<span id="L202" class="LineNr">202 </span><span class="Delimiter">:(scenario negate_can_overflow)</span>  <span class="Comment">// in exactly one situation</span>
-<span id="L203" class="LineNr">203 </span><span class="Special">% Reg[EBX].i = 0x80000000;  // INT_MIN</span>
-<span id="L204" class="LineNr">204 </span>== <span class="Constant">0x1</span>
-<span id="L205" class="LineNr">205 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L206" class="LineNr">206 </span>  f7  db                                      <span class="Comment"># negate EBX</span>
-<span id="L207" class="LineNr">207 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (subop negate) 011 (dest EBX)</span>
-<span id="L208" class="LineNr">208 </span><span class="traceContains">+run: operate on r/m32</span>
-<span id="L209" class="LineNr">209 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L210" class="LineNr">210 </span><span class="traceContains">+run: subop: negate</span>
-<span id="L211" class="LineNr">211 </span><span class="traceContains">+run: overflow</span>
-<span id="L212" class="LineNr">212 </span>
-<span id="L213" class="LineNr">213 </span><span class="SalientComment">//:: shift left</span>
-<span id="L214" class="LineNr">214 </span>
-<span id="L215" class="LineNr">215 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L216" class="LineNr">216 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;d3&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;shift rm32 by CL bits depending on subop (sal/sar/shl/shr)&quot;</span><span class="Delimiter">);</span>
-<span id="L217" class="LineNr">217 </span>
-<span id="L218" class="LineNr">218 </span><span class="Delimiter">:(scenario shift_left_r32_with_cl)</span>
-<span id="L219" class="LineNr">219 </span><span class="Special">% Reg[EBX].i = 13;</span>
-<span id="L220" class="LineNr">220 </span><span class="Special">% Reg[ECX].i = 1;</span>
-<span id="L221" class="LineNr">221 </span>== <span class="Constant">0x1</span>
-<span id="L222" class="LineNr">222 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L223" class="LineNr">223 </span>  d3  e3                                      <span class="Comment"># negate EBX</span>
-<span id="L224" class="LineNr">224 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 100 (subop shift left) 011 (dest EBX)</span>
-<span id="L225" class="LineNr">225 </span><span class="traceContains">+run: operate on r/m32</span>
-<span id="L226" class="LineNr">226 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L227" class="LineNr">227 </span><span class="traceContains">+run: subop: shift left by CL bits</span>
-<span id="L228" class="LineNr">228 </span><span class="traceContains">+run: storing 0x0000001a</span>
-<span id="L229" class="LineNr">229 </span>
-<span id="L230" class="LineNr">230 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L231" class="LineNr">231 </span><span class="Normal">case</span> <span class="Constant">0xd3</span>: <span class="Delimiter">{</span>
-<span id="L232" class="LineNr">232 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L233" class="LineNr">233 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;operate on r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L234" class="LineNr">234 </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="L235" class="LineNr">235 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
-<span id="L236" class="LineNr">236 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L237" class="LineNr">237 </span>  <span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>  <span class="Comment">// shift left r/m32 by CL</span>
-<span id="L238" class="LineNr">238 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: shift left by CL bits&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L239" class="LineNr">239 </span>    <span class="Normal">uint8_t</span> count = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &amp; <span class="Constant">0x1f</span><span class="Delimiter">;</span>
-<span id="L240" class="LineNr">240 </span>    <span class="Comment">// OF is only defined if count is 1</span>
-<span id="L241" class="LineNr">241 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>count == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L242" class="LineNr">242 </span>      <span class="Normal">bool</span> msb = <span class="Delimiter">(</span>*arg1 &amp; <span class="Constant">0x80000000</span><span class="Delimiter">)</span> &gt;&gt; <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L243" class="LineNr">243 </span>      <span class="Normal">bool</span> pnsb = <span class="Delimiter">(</span>*arg1 &amp; <span class="Constant">0x40000000</span><span class="Delimiter">);</span>
-<span id="L244" class="LineNr">244 </span>      <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>msb != pnsb<span class="Delimiter">);</span>
-<span id="L245" class="LineNr">245 </span>    <span class="Delimiter">}</span>
-<span id="L246" class="LineNr">246 </span>    *arg1 = <span class="Delimiter">(</span>*arg1 &lt;&lt; count<span class="Delimiter">);</span>
-<span id="L247" class="LineNr">247 </span>    ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L248" class="LineNr">248 </span>    SF = <span class="Delimiter">(</span>*arg1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L249" class="LineNr">249 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L433'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L250" class="LineNr">250 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L251" class="LineNr">251 </span>  <span class="Delimiter">}</span>
-<span id="L252" class="LineNr">252 </span>  <span class="Comment">// End Op d3 Subops</span>
-<span id="L253" class="LineNr">253 </span>  <span class="Normal">default</span>:
-<span id="L254" class="LineNr">254 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized subop for opcode d3: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L255" class="LineNr">255 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L256" class="LineNr">256 </span>  <span class="Delimiter">}</span>
-<span id="L257" class="LineNr">257 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L258" class="LineNr">258 </span><span class="Delimiter">}</span>
-<span id="L259" class="LineNr">259 </span>
-<span id="L260" class="LineNr">260 </span><span class="SalientComment">//:: shift right arithmetic</span>
-<span id="L261" class="LineNr">261 </span>
-<span id="L262" class="LineNr">262 </span><span class="Delimiter">:(scenario shift_right_arithmetic_r32_with_cl)</span>
-<span id="L263" class="LineNr">263 </span><span class="Special">% Reg[EBX].i = 26;</span>
-<span id="L264" class="LineNr">264 </span><span class="Special">% Reg[ECX].i = 1;</span>
-<span id="L265" class="LineNr">265 </span>== <span class="Constant">0x1</span>
-<span id="L266" class="LineNr">266 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L267" class="LineNr">267 </span>  d3  fb                                      <span class="Comment"># negate EBX</span>
-<span id="L268" class="LineNr">268 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (subop shift right arithmetic) 011 (dest EBX)</span>
-<span id="L269" class="LineNr">269 </span><span class="traceContains">+run: operate on r/m32</span>
-<span id="L270" class="LineNr">270 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L271" class="LineNr">271 </span><span class="traceContains">+run: subop: shift right by CL bits, while preserving sign</span>
-<span id="L272" class="LineNr">272 </span><span class="traceContains">+run: storing 0x0000000d</span>
-<span id="L273" class="LineNr">273 </span>
-<span id="L274" class="LineNr">274 </span><span class="Delimiter">:(before &quot;End Op d3 Subops&quot;)</span>
-<span id="L275" class="LineNr">275 </span><span class="Normal">case</span> <span class="Constant">7</span>: <span class="Delimiter">{</span>  <span class="Comment">// shift right r/m32 by CL, preserving sign</span>
-<span id="L276" class="LineNr">276 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: shift right by CL bits, while preserving sign&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L277" class="LineNr">277 </span>  <span class="Normal">uint8_t</span> count = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &amp; <span class="Constant">0x1f</span><span class="Delimiter">;</span>
-<span id="L278" class="LineNr">278 </span>  *arg1 = <span class="Delimiter">(</span>*arg1 &gt;&gt; count<span class="Delimiter">);</span>
-<span id="L279" class="LineNr">279 </span>  ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L280" class="LineNr">280 </span>  SF = <span class="Delimiter">(</span>*arg1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L281" class="LineNr">281 </span>  <span class="Comment">// OF is only defined if count is 1</span>
-<span id="L282" class="LineNr">282 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>count == <span class="Constant">1</span><span class="Delimiter">)</span> <a href='010---vm.cc.html#L81'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L283" class="LineNr">283 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L433'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L284" class="LineNr">284 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L285" class="LineNr">285 </span><span class="Delimiter">}</span>
-<span id="L286" class="LineNr">286 </span>
-<span id="L287" class="LineNr">287 </span><span class="Delimiter">:(scenario shift_right_arithmetic_odd_r32_with_cl)</span>
-<span id="L288" class="LineNr">288 </span><span class="Special">% Reg[EBX].i = 27;</span>
-<span id="L289" class="LineNr">289 </span><span class="Special">% Reg[ECX].i = 1;</span>
-<span id="L290" class="LineNr">290 </span>== <span class="Constant">0x1</span>
-<span id="L291" class="LineNr">291 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L292" class="LineNr">292 </span>  d3  fb                                      <span class="Comment"># negate EBX</span>
-<span id="L293" class="LineNr">293 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (subop shift right arithmetic) 011 (dest EBX)</span>
-<span id="L294" class="LineNr">294 </span><span class="traceContains">+run: operate on r/m32</span>
-<span id="L295" class="LineNr">295 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L296" class="LineNr">296 </span><span class="traceContains">+run: subop: shift right by CL bits, while preserving sign</span>
-<span id="L297" class="LineNr">297 </span><span class="Comment"># result: 13</span>
-<span id="L298" class="LineNr">298 </span><span class="traceContains">+run: storing 0x0000000d</span>
-<span id="L299" class="LineNr">299 </span>
-<span id="L300" class="LineNr">300 </span><span class="Delimiter">:(scenario shift_right_arithmetic_negative_r32_with_cl)</span>
-<span id="L301" class="LineNr">301 </span><span class="Special">% Reg[EBX].i = 0xfffffffd;  // -3</span>
-<span id="L302" class="LineNr">302 </span><span class="Special">% Reg[ECX].i = 1;</span>
-<span id="L303" class="LineNr">303 </span>== <span class="Constant">0x1</span>
-<span id="L304" class="LineNr">304 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L305" class="LineNr">305 </span>  d3  fb                                      <span class="Comment"># negate EBX</span>
-<span id="L306" class="LineNr">306 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (subop shift right arithmetic) 011 (dest EBX)</span>
-<span id="L307" class="LineNr">307 </span><span class="traceContains">+run: operate on r/m32</span>
-<span id="L308" class="LineNr">308 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L309" class="LineNr">309 </span><span class="traceContains">+run: subop: shift right by CL bits, while preserving sign</span>
-<span id="L310" class="LineNr">310 </span><span class="Comment"># result: -2</span>
-<span id="L311" class="LineNr">311 </span><span class="traceContains">+run: storing 0xfffffffe</span>
-<span id="L312" class="LineNr">312 </span>
-<span id="L313" class="LineNr">313 </span><span class="SalientComment">//:: shift right logical</span>
-<span id="L314" class="LineNr">314 </span>
-<span id="L315" class="LineNr">315 </span><span class="Delimiter">:(scenario shift_right_logical_r32_with_cl)</span>
-<span id="L316" class="LineNr">316 </span><span class="Special">% Reg[EBX].i = 26;</span>
-<span id="L317" class="LineNr">317 </span><span class="Special">% Reg[ECX].i = 1;</span>
-<span id="L318" class="LineNr">318 </span>== <span class="Constant">0x1</span>
-<span id="L319" class="LineNr">319 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L320" class="LineNr">320 </span>  d3  eb                                      <span class="Comment"># negate EBX</span>
-<span id="L321" class="LineNr">321 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 101 (subop shift right logical) 011 (dest EBX)</span>
-<span id="L322" class="LineNr">322 </span><span class="traceContains">+run: operate on r/m32</span>
-<span id="L323" class="LineNr">323 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L324" class="LineNr">324 </span><span class="traceContains">+run: subop: shift right by CL bits, while padding zeroes</span>
-<span id="L325" class="LineNr">325 </span><span class="traceContains">+run: storing 0x0000000d</span>
+<span id="L6" class="LineNr">  6 </span><span class="Delimiter">:(code)</span>
+<span id="L7" class="LineNr">  7 </span><span class="Normal">void</span> <a href='013direct_addressing.cc.html#L7'>test_add_r32_to_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L8" class="LineNr">  8 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x10</span><span class="Delimiter">;</span>
+<span id="L9" class="LineNr">  9 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L10" class="LineNr"> 10 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L11" class="LineNr"> 11 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L12" class="LineNr"> 12 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L13" class="LineNr"> 13 </span>      <span class="Constant">&quot;  01     d8                                    \n&quot;</span> <span class="Comment">// add EBX to EAX</span>
+<span id="L14" class="LineNr"> 14 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L15" class="LineNr"> 15 </span>  <span class="Delimiter">);</span>
+<span id="L16" class="LineNr"> 16 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L17" class="LineNr"> 17 </span>      <span class="Constant">&quot;run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32\n&quot;</span>
+<span id="L18" class="LineNr"> 18 </span>      <span class="Constant">&quot;run: r/m32 is EAX\n&quot;</span>
+<span id="L19" class="LineNr"> 19 </span>      <span class="Constant">&quot;run: storing 0x00000011\n&quot;</span>
+<span id="L20" class="LineNr"> 20 </span>  <span class="Delimiter">);</span>
+<span id="L21" class="LineNr"> 21 </span><span class="Delimiter">}</span>
+<span id="L22" class="LineNr"> 22 </span>
+<span id="L23" class="LineNr"> 23 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L24" class="LineNr"> 24 </span><span class="Normal">case</span> <span class="Constant">0x01</span>: <span class="Delimiter">{</span>  <span class="Comment">// add r32 to r/m32</span>
+<span id="L25" class="LineNr"> 25 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
+<span id="L26" class="LineNr"> 26 </span>  <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L27" class="LineNr"> 27 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L73'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L28" class="LineNr"> 28 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L38'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L29" class="LineNr"> 29 </span>  <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">);</span>
+<span id="L30" class="LineNr"> 30 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L31" class="LineNr"> 31 </span><span class="Delimiter">}</span>
+<span id="L32" class="LineNr"> 32 </span>
+<span id="L33" class="LineNr"> 33 </span><span class="Delimiter">:(code)</span>
+<span id="L34" class="LineNr"> 34 </span><span class="Comment">// Implement tables 2-2 and 2-3 in the Intel manual, Volume 2.</span>
+<span id="L35" class="LineNr"> 35 </span><span class="Comment">// We return a pointer so that instructions can write to multiple bytes in</span>
+<span id="L36" class="LineNr"> 36 </span><span class="Comment">// 'Mem' at once.</span>
+<span id="L37" class="LineNr"> 37 </span><span class="Comment">// beware: will eventually have side-effects</span>
+<span id="L38" class="LineNr"> 38 </span><span class="Normal">int32_t</span>* <a href='013direct_addressing.cc.html#L38'>effective_address</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> modrm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L39" class="LineNr"> 39 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> mod = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">6</span><span class="Delimiter">);</span>
+<span id="L40" class="LineNr"> 40 </span>  <span class="Comment">// ignore middle 3 'reg opcode' bits</span>
+<span id="L41" class="LineNr"> 41 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> rm = modrm &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L42" class="LineNr"> 42 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>mod == <span class="Constant">3</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L43" class="LineNr"> 43 </span>    <span class="Comment">// mod 3 is just register direct addressing</span>
+<span id="L44" class="LineNr"> 44 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;r/m32 is &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L73'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L45" class="LineNr"> 45 </span>    <span class="Identifier">return</span> &amp;<span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rm]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
+<span id="L46" class="LineNr"> 46 </span>  <span class="Delimiter">}</span>
+<span id="L47" class="LineNr"> 47 </span>  <span class="Normal">uint32_t</span> addr = <a href='013direct_addressing.cc.html#L53'>effective_address_number</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L48" class="LineNr"> 48 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address contains &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L213'>read_mem_i32</a><span class="Delimiter">(</span>addr<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L49" class="LineNr"> 49 </span>  <span class="Identifier">return</span> <a href='010---vm.cc.html#L248'>mem_addr_i32</a><span class="Delimiter">(</span>addr<span class="Delimiter">);</span>
+<span id="L50" class="LineNr"> 50 </span><span class="Delimiter">}</span>
+<span id="L51" class="LineNr"> 51 </span>
+<span id="L52" class="LineNr"> 52 </span><span class="Comment">// beware: will eventually have side-effects</span>
+<span id="L53" class="LineNr"> 53 </span><span class="Normal">uint32_t</span> <a href='013direct_addressing.cc.html#L53'>effective_address_number</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> modrm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L54" class="LineNr"> 54 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> mod = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">6</span><span class="Delimiter">);</span>
+<span id="L55" class="LineNr"> 55 </span>  <span class="Comment">// ignore middle 3 'reg opcode' bits</span>
+<span id="L56" class="LineNr"> 56 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> rm = modrm &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L57" class="LineNr"> 57 </span>  <span class="Normal">uint32_t</span> addr = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L58" class="LineNr"> 58 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>mod<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L59" class="LineNr"> 59 </span>  <span class="Normal">case</span> <span class="Constant">3</span>:
+<span id="L60" class="LineNr"> 60 </span>    <span class="Comment">// mod 3 is just register direct addressing</span>
+<span id="L61" class="LineNr"> 61 </span>    <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;unexpected direct addressing mode\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L62" class="LineNr"> 62 </span>    <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L63" class="LineNr"> 63 </span>  <span class="Comment">// End Mod Special-cases(addr)</span>
+<span id="L64" class="LineNr"> 64 </span>  <span class="Normal">default</span>:
+<span id="L65" class="LineNr"> 65 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized mod bits: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span>mod<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L66" class="LineNr"> 66 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L67" class="LineNr"> 67 </span>  <span class="Delimiter">}</span>
+<span id="L68" class="LineNr"> 68 </span>  <span class="Comment">//: other mods are indirect, and they'll set addr appropriately</span>
+<span id="L69" class="LineNr"> 69 </span>  <span class="Comment">// Found effective_address(addr)</span>
+<span id="L70" class="LineNr"> 70 </span>  <span class="Identifier">return</span> addr<span class="Delimiter">;</span>
+<span id="L71" class="LineNr"> 71 </span><span class="Delimiter">}</span>
+<span id="L72" class="LineNr"> 72 </span>
+<span id="L73" class="LineNr"> 73 </span>string <a href='013direct_addressing.cc.html#L73'>rname</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L74" class="LineNr"> 74 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L75" class="LineNr"> 75 </span>  <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Identifier">return</span> <span class="Constant">&quot;EAX&quot;</span><span class="Delimiter">;</span>
+<span id="L76" class="LineNr"> 76 </span>  <span class="Normal">case</span> <span class="Constant">1</span>: <span class="Identifier">return</span> <span class="Constant">&quot;ECX&quot;</span><span class="Delimiter">;</span>
+<span id="L77" class="LineNr"> 77 </span>  <span class="Normal">case</span> <span class="Constant">2</span>: <span class="Identifier">return</span> <span class="Constant">&quot;EDX&quot;</span><span class="Delimiter">;</span>
+<span id="L78" class="LineNr"> 78 </span>  <span class="Normal">case</span> <span class="Constant">3</span>: <span class="Identifier">return</span> <span class="Constant">&quot;EBX&quot;</span><span class="Delimiter">;</span>
+<span id="L79" class="LineNr"> 79 </span>  <span class="Normal">case</span> <span class="Constant">4</span>: <span class="Identifier">return</span> <span class="Constant">&quot;ESP&quot;</span><span class="Delimiter">;</span>
+<span id="L80" class="LineNr"> 80 </span>  <span class="Normal">case</span> <span class="Constant">5</span>: <span class="Identifier">return</span> <span class="Constant">&quot;EBP&quot;</span><span class="Delimiter">;</span>
+<span id="L81" class="LineNr"> 81 </span>  <span class="Normal">case</span> <span class="Constant">6</span>: <span class="Identifier">return</span> <span class="Constant">&quot;ESI&quot;</span><span class="Delimiter">;</span>
+<span id="L82" class="LineNr"> 82 </span>  <span class="Normal">case</span> <span class="Constant">7</span>: <span class="Identifier">return</span> <span class="Constant">&quot;EDI&quot;</span><span class="Delimiter">;</span>
+<span id="L83" class="LineNr"> 83 </span>  <span class="Normal">default</span>: <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid register &quot;</span> &lt;&lt; r &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>  <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L84" class="LineNr"> 84 </span>  <span class="Delimiter">}</span>
+<span id="L85" class="LineNr"> 85 </span><span class="Delimiter">}</span>
+<span id="L86" class="LineNr"> 86 </span>
+<span id="L87" class="LineNr"> 87 </span><span class="SalientComment">//:: subtract</span>
+<span id="L88" class="LineNr"> 88 </span>
+<span id="L89" class="LineNr"> 89 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L90" class="LineNr"> 90 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;29&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract r32 from rm32 (sub)&quot;</span><span class="Delimiter">);</span>
+<span id="L91" class="LineNr"> 91 </span>
+<span id="L92" class="LineNr"> 92 </span><span class="Delimiter">:(code)</span>
+<span id="L93" class="LineNr"> 93 </span><span class="Normal">void</span> <a href='013direct_addressing.cc.html#L93'>test_subtract_r32_from_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L94" class="LineNr"> 94 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">10</span><span class="Delimiter">;</span>
+<span id="L95" class="LineNr"> 95 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L96" class="LineNr"> 96 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L97" class="LineNr"> 97 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L98" class="LineNr"> 98 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L99" class="LineNr"> 99 </span>      <span class="Constant">&quot;  29     d8                                    \n&quot;</span>  <span class="Comment">// subtract EBX from EAX</span>
+<span id="L100" class="LineNr">100 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L101" class="LineNr">101 </span>  <span class="Delimiter">);</span>
+<span id="L102" class="LineNr">102 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L103" class="LineNr">103 </span>      <span class="Constant">&quot;run: subtract <a href='010---vm.cc.html#L16'>EBX</a> from r/m32\n&quot;</span>
+<span id="L104" class="LineNr">104 </span>      <span class="Constant">&quot;run: r/m32 is EAX\n&quot;</span>
+<span id="L105" class="LineNr">105 </span>      <span class="Constant">&quot;run: storing 0x00000009\n&quot;</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 id="L109" class="LineNr">109 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L110" class="LineNr">110 </span><span class="Normal">case</span> <span class="Constant">0x29</span>: <span class="Delimiter">{</span>  <span class="Comment">// subtract r32 from r/m32</span>
+<span id="L111" class="LineNr">111 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
+<span id="L112" class="LineNr">112 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L113" class="LineNr">113 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L73'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; from r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L114" class="LineNr">114 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L38'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L115" class="LineNr">115 </span>  <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">);</span>
+<span id="L116" class="LineNr">116 </span>  <span class="Identifier">break</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="SalientComment">//:: multiply</span>
+<span id="L120" class="LineNr">120 </span>
+<span id="L121" class="LineNr">121 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L122" class="LineNr">122 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;f7&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;negate/multiply rm32 (with <a href='010---vm.cc.html#L13'>EAX</a> if necessary) depending on subop (neg/mul)&quot;</span><span class="Delimiter">);</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='013direct_addressing.cc.html#L125'>test_multiply_eax_by_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L126" class="LineNr">126 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">4</span><span class="Delimiter">;</span>
+<span id="L127" class="LineNr">127 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>i = <span class="Constant">3</span><span class="Delimiter">;</span>
+<span id="L128" class="LineNr">128 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L129" class="LineNr">129 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L130" class="LineNr">130 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L131" class="LineNr">131 </span>      <span class="Constant">&quot;  f7     e1                                    \n&quot;</span>  <span class="Comment">// multiply EAX by ECX</span>
+<span id="L132" class="LineNr">132 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 100 (subop mul) 001 (src ECX)</span>
+<span id="L133" class="LineNr">133 </span>  <span class="Delimiter">);</span>
+<span id="L134" class="LineNr">134 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L135" class="LineNr">135 </span>      <span class="Constant">&quot;run: operate on r/m32\n&quot;</span>
+<span id="L136" class="LineNr">136 </span>      <span class="Constant">&quot;run: r/m32 is ECX\n&quot;</span>
+<span id="L137" class="LineNr">137 </span>      <span class="Constant">&quot;run: subop: multiply <a href='010---vm.cc.html#L13'>EAX</a> by r/m32\n&quot;</span>
+<span id="L138" class="LineNr">138 </span>      <span class="Constant">&quot;run: storing 0x0000000c\n&quot;</span>
+<span id="L139" class="LineNr">139 </span>  <span class="Delimiter">);</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="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L143" class="LineNr">143 </span><span class="Normal">case</span> <span class="Constant">0xf7</span>: <span class="Delimiter">{</span>
+<span id="L144" class="LineNr">144 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
+<span id="L145" class="LineNr">145 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;operate on r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L146" class="LineNr">146 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L38'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L147" class="LineNr">147 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
+<span id="L148" class="LineNr">148 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L149" class="LineNr">149 </span>  <span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>  <span class="Comment">// mul unsigned EAX by r/m32</span>
+<span id="L150" class="LineNr">150 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: multiply <a href='010---vm.cc.html#L13'>EAX</a> by r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L151" class="LineNr">151 </span>    <span class="Normal">const</span> <span class="Normal">uint64_t</span> result = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>u * <span class="Normal">static_cast</span>&lt;<span class="Normal">uint32_t</span>&gt;<span class="Delimiter">(</span>*arg1<span class="Delimiter">);</span>
+<span id="L152" class="LineNr">152 </span>    <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>u = result &amp; <span class="Constant">0xffffffff</span><span class="Delimiter">;</span>
+<span id="L153" class="LineNr">153 </span>    <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EDX]<span class="Delimiter">.</span>u = result &gt;&gt; <span class="Constant">32</span><span class="Delimiter">;</span>
+<span id="L154" class="LineNr">154 </span>    <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EDX]<span class="Delimiter">.</span>u != <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L155" class="LineNr">155 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L440'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L156" class="LineNr">156 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L157" class="LineNr">157 </span>  <span class="Delimiter">}</span>
+<span id="L158" class="LineNr">158 </span>  <span class="Comment">// End Op f7 Subops</span>
+<span id="L159" class="LineNr">159 </span>  <span class="Normal">default</span>:
+<span id="L160" class="LineNr">160 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized subop for opcode f7: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L161" class="LineNr">161 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L162" class="LineNr">162 </span>  <span class="Delimiter">}</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>
+<span id="L166" class="LineNr">166 </span><span class="Comment">//:</span>
+<span id="L167" class="LineNr">167 </span>
+<span id="L168" class="LineNr">168 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L169" class="LineNr">169 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L388'>Name_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;af&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;multiply rm32 into r32 (imul)&quot;</span><span class="Delimiter">);</span>
+<span id="L170" class="LineNr">170 </span>
+<span id="L171" class="LineNr">171 </span><span class="Delimiter">:(code)</span>
+<span id="L172" class="LineNr">172 </span><span class="Normal">void</span> <a href='013direct_addressing.cc.html#L172'>test_multiply_r32_into_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L173" class="LineNr">173 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">4</span><span class="Delimiter">;</span>
+<span id="L174" class="LineNr">174 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">2</span><span class="Delimiter">;</span>
+<span id="L175" class="LineNr">175 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L176" class="LineNr">176 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L177" class="LineNr">177 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L178" class="LineNr">178 </span>      <span class="Constant">&quot;  0f af  d8                                    \n&quot;</span>  <span class="Comment">// subtract EBX into EAX</span>
+<span id="L179" class="LineNr">179 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L180" class="LineNr">180 </span>  <span class="Delimiter">);</span>
+<span id="L181" class="LineNr">181 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L182" class="LineNr">182 </span>      <span class="Constant">&quot;run: multiply r/m32 into EBX\n&quot;</span>
+<span id="L183" class="LineNr">183 </span>      <span class="Constant">&quot;run: r/m32 is EAX\n&quot;</span>
+<span id="L184" class="LineNr">184 </span>      <span class="Constant">&quot;run: storing 0x00000008\n&quot;</span>
+<span id="L185" class="LineNr">185 </span>  <span class="Delimiter">);</span>
+<span id="L186" class="LineNr">186 </span><span class="Delimiter">}</span>
+<span id="L187" class="LineNr">187 </span>
+<span id="L188" class="LineNr">188 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
+<span id="L189" class="LineNr">189 </span><span class="Normal">case</span> <span class="Constant">0xaf</span>: <span class="Delimiter">{</span>  <span class="Comment">// multiply r32 into r/m32</span>
+<span id="L190" class="LineNr">190 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
+<span id="L191" class="LineNr">191 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L192" class="LineNr">192 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;multiply r/m32 into &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L73'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L193" class="LineNr">193 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L38'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L194" class="LineNr">194 </span>  <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>*<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> *arg1<span class="Delimiter">);</span>
+<span id="L195" class="LineNr">195 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L196" class="LineNr">196 </span><span class="Delimiter">}</span>
+<span id="L197" class="LineNr">197 </span>
+<span id="L198" class="LineNr">198 </span><span class="SalientComment">//:: negate</span>
+<span id="L199" class="LineNr">199 </span>
+<span id="L200" class="LineNr">200 </span><span class="Delimiter">:(code)</span>
+<span id="L201" class="LineNr">201 </span><span class="Normal">void</span> <a href='013direct_addressing.cc.html#L201'>test_negate_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L202" class="LineNr">202 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L203" class="LineNr">203 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L204" class="LineNr">204 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L205" class="LineNr">205 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L206" class="LineNr">206 </span>      <span class="Constant">&quot;  f7 db                                        \n&quot;</span>  <span class="Comment">// negate EBX</span>
+<span id="L207" class="LineNr">207 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 011 (subop negate) 011 (dest EBX)</span>
+<span id="L208" class="LineNr">208 </span>  <span class="Delimiter">);</span>
+<span id="L209" class="LineNr">209 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L210" class="LineNr">210 </span>      <span class="Constant">&quot;run: operate on r/m32\n&quot;</span>
+<span id="L211" class="LineNr">211 </span>      <span class="Constant">&quot;run: r/m32 is EBX\n&quot;</span>
+<span id="L212" class="LineNr">212 </span>      <span class="Constant">&quot;run: subop: negate\n&quot;</span>
+<span id="L213" class="LineNr">213 </span>      <span class="Constant">&quot;run: storing 0xffffffff\n&quot;</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 id="L217" class="LineNr">217 </span><span class="Delimiter">:(before &quot;End Op f7 Subops&quot;)</span>
+<span id="L218" class="LineNr">218 </span><span class="Normal">case</span> <span class="Constant">3</span>: <span class="Delimiter">{</span>  <span class="Comment">// negate r/m32</span>
+<span id="L219" class="LineNr">219 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: negate&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L220" class="LineNr">220 </span>  <span class="Comment">// one case that can overflow</span>
+<span id="L221" class="LineNr">221 </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>*arg1<span class="Delimiter">)</span> == <span class="Constant">0x80000000</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L222" class="LineNr">222 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;overflow&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L223" class="LineNr">223 </span>    SF = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L224" class="LineNr">224 </span>    <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L225" class="LineNr">225 </span>    <a href='010---vm.cc.html#L81'>OF</a> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L226" class="LineNr">226 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L227" class="LineNr">227 </span>  <span class="Delimiter">}</span>
+<span id="L228" class="LineNr">228 </span>  *arg1 = -<span class="Delimiter">(</span>*arg1<span class="Delimiter">);</span>
+<span id="L229" class="LineNr">229 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L440'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L230" class="LineNr">230 </span>  SF = <span class="Delimiter">(</span>*arg1 &gt;&gt; <span class="Constant">31</span><span class="Delimiter">);</span>
+<span id="L231" class="LineNr">231 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L232" class="LineNr">232 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L233" class="LineNr">233 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<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="Delimiter">:(code)</span>
+<span id="L237" class="LineNr">237 </span><span class="Comment">// negate can overflow in exactly one situation</span>
+<span id="L238" class="LineNr">238 </span><span class="Normal">void</span> <a href='013direct_addressing.cc.html#L238'>test_negate_can_overflow</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L239" class="LineNr">239 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x80000000</span><span class="Delimiter">;</span>  <span class="Comment">// INT_MIN</span>
+<span id="L240" class="LineNr">240 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L241" class="LineNr">241 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L242" class="LineNr">242 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L243" class="LineNr">243 </span>      <span class="Constant">&quot;  f7 db                                        \n&quot;</span>  <span class="Comment">// negate EBX</span>
+<span id="L244" class="LineNr">244 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 011 (subop negate) 011 (dest EBX)</span>
+<span id="L245" class="LineNr">245 </span>  <span class="Delimiter">);</span>
+<span id="L246" class="LineNr">246 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L247" class="LineNr">247 </span>      <span class="Constant">&quot;run: operate on r/m32\n&quot;</span>
+<span id="L248" class="LineNr">248 </span>      <span class="Constant">&quot;run: r/m32 is EBX\n&quot;</span>
+<span id="L249" class="LineNr">249 </span>      <span class="Constant">&quot;run: subop: negate\n&quot;</span>
+<span id="L250" class="LineNr">250 </span>      <span class="Constant">&quot;run: overflow\n&quot;</span>
+<span id="L251" class="LineNr">251 </span>  <span class="Delimiter">);</span>
+<span id="L252" class="LineNr">252 </span><span class="Delimiter">}</span>
+<span id="L253" class="LineNr">253 </span>
+<span id="L254" class="LineNr">254 </span><span class="SalientComment">//:: shift left</span>
+<span id="L255" class="LineNr">255 </span>
+<span id="L256" class="LineNr">256 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L257" class="LineNr">257 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;d3&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;shift rm32 by CL bits depending on subop (sal/sar/shl/shr)&quot;</span><span class="Delimiter">);</span>
+<span id="L258" class="LineNr">258 </span>
+<span id="L259" class="LineNr">259 </span><span class="Delimiter">:(code)</span>
+<span id="L260" class="LineNr">260 </span><span class="Normal">void</span> <a href='013direct_addressing.cc.html#L260'>test_shift_left_r32_with_cl</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L261" class="LineNr">261 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">13</span><span class="Delimiter">;</span>
+<span id="L262" class="LineNr">262 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>i = <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L263" class="LineNr">263 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L264" class="LineNr">264 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L265" class="LineNr">265 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L266" class="LineNr">266 </span>      <span class="Constant">&quot;  d3     e3                                    \n&quot;</span>  <span class="Comment">// shift EBX left by CL bits</span>
+<span id="L267" class="LineNr">267 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 100 (subop shift left) 011 (dest EBX)</span>
+<span id="L268" class="LineNr">268 </span>  <span class="Delimiter">);</span>
+<span id="L269" class="LineNr">269 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L270" class="LineNr">270 </span>      <span class="Constant">&quot;run: operate on r/m32\n&quot;</span>
+<span id="L271" class="LineNr">271 </span>      <span class="Constant">&quot;run: r/m32 is EBX\n&quot;</span>
+<span id="L272" class="LineNr">272 </span>      <span class="Constant">&quot;run: subop: shift left by CL bits\n&quot;</span>
+<span id="L273" class="LineNr">273 </span>      <span class="Constant">&quot;run: storing 0x0000001a\n&quot;</span>
+<span id="L274" class="LineNr">274 </span>  <span class="Delimiter">);</span>
+<span id="L275" class="LineNr">275 </span><span class="Delimiter">}</span>
+<span id="L276" class="LineNr">276 </span>
+<span id="L277" class="LineNr">277 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L278" class="LineNr">278 </span><span class="Normal">case</span> <span class="Constant">0xd3</span>: <span class="Delimiter">{</span>
+<span id="L279" class="LineNr">279 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
+<span id="L280" class="LineNr">280 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;operate on r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L281" class="LineNr">281 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L38'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L282" class="LineNr">282 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
+<span id="L283" class="LineNr">283 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L284" class="LineNr">284 </span>  <span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>  <span class="Comment">// shift left r/m32 by CL</span>
+<span id="L285" class="LineNr">285 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: shift left by CL bits&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L286" class="LineNr">286 </span>    <span class="Normal">uint8_t</span> count = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &amp; <span class="Constant">0x1f</span><span class="Delimiter">;</span>
+<span id="L287" class="LineNr">287 </span>    <span class="Comment">// OF is only defined if count is 1</span>
+<span id="L288" class="LineNr">288 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>count == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L289" class="LineNr">289 </span>      <span class="Normal">bool</span> msb = <span class="Delimiter">(</span>*arg1 &amp; <span class="Constant">0x80000000</span><span class="Delimiter">)</span> &gt;&gt; <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L290" class="LineNr">290 </span>      <span class="Normal">bool</span> pnsb = <span class="Delimiter">(</span>*arg1 &amp; <span class="Constant">0x40000000</span><span class="Delimiter">);</span>
+<span id="L291" class="LineNr">291 </span>      <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>msb != pnsb<span class="Delimiter">);</span>
+<span id="L292" class="LineNr">292 </span>    <span class="Delimiter">}</span>
+<span id="L293" class="LineNr">293 </span>    *arg1 = <span class="Delimiter">(</span>*arg1 &lt;&lt; count<span class="Delimiter">);</span>
+<span id="L294" class="LineNr">294 </span>    <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L295" class="LineNr">295 </span>    SF = <span class="Delimiter">(</span>*arg1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L296" class="LineNr">296 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L440'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L297" class="LineNr">297 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L298" class="LineNr">298 </span>  <span class="Delimiter">}</span>
+<span id="L299" class="LineNr">299 </span>  <span class="Comment">// End Op d3 Subops</span>
+<span id="L300" class="LineNr">300 </span>  <span class="Normal">default</span>:
+<span id="L301" class="LineNr">301 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized subop for opcode d3: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L302" class="LineNr">302 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</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">break</span><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="SalientComment">//:: shift right arithmetic</span>
+<span id="L308" class="LineNr">308 </span>
+<span id="L309" class="LineNr">309 </span><span class="Delimiter">:(code)</span>
+<span id="L310" class="LineNr">310 </span><span class="Normal">void</span> <a href='013direct_addressing.cc.html#L310'>test_shift_right_arithmetic_r32_with_cl</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L311" class="LineNr">311 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">26</span><span class="Delimiter">;</span>
+<span id="L312" class="LineNr">312 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>i = <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L313" class="LineNr">313 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L314" class="LineNr">314 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L315" class="LineNr">315 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L316" class="LineNr">316 </span>      <span class="Constant">&quot;  d3     fb                                    \n&quot;</span>  <span class="Comment">// shift EBX right by CL bits, while preserving sign</span>
+<span id="L317" class="LineNr">317 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 111 (subop shift right arithmetic) 011 (dest EBX)</span>
+<span id="L318" class="LineNr">318 </span>  <span class="Delimiter">);</span>
+<span id="L319" class="LineNr">319 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L320" class="LineNr">320 </span>      <span class="Constant">&quot;run: operate on r/m32\n&quot;</span>
+<span id="L321" class="LineNr">321 </span>      <span class="Constant">&quot;run: r/m32 is EBX\n&quot;</span>
+<span id="L322" class="LineNr">322 </span>      <span class="Constant">&quot;run: subop: shift right by CL bits, while preserving sign\n&quot;</span>
+<span id="L323" class="LineNr">323 </span>      <span class="Constant">&quot;run: storing 0x0000000d\n&quot;</span>
+<span id="L324" class="LineNr">324 </span>  <span class="Delimiter">);</span>
+<span id="L325" class="LineNr">325 </span><span class="Delimiter">}</span>
 <span id="L326" class="LineNr">326 </span>
 <span id="L327" class="LineNr">327 </span><span class="Delimiter">:(before &quot;End Op d3 Subops&quot;)</span>
-<span id="L328" class="LineNr">328 </span><span class="Normal">case</span> <span class="Constant">5</span>: <span class="Delimiter">{</span>  <span class="Comment">// shift right r/m32 by CL, preserving sign</span>
-<span id="L329" class="LineNr">329 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: shift right by CL bits, while padding zeroes&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L328" class="LineNr">328 </span><span class="Normal">case</span> <span class="Constant">7</span>: <span class="Delimiter">{</span>  <span class="Comment">// shift right r/m32 by CL, preserving sign</span>
+<span id="L329" class="LineNr">329 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: shift right by CL bits, while preserving sign&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L330" class="LineNr">330 </span>  <span class="Normal">uint8_t</span> count = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &amp; <span class="Constant">0x1f</span><span class="Delimiter">;</span>
-<span id="L331" class="LineNr">331 </span>  <span class="Comment">// OF is only defined if count is 1</span>
-<span id="L332" class="LineNr">332 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>count == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L333" class="LineNr">333 </span>    <span class="Normal">bool</span> msb = <span class="Delimiter">(</span>*arg1 &amp; <span class="Constant">0x80000000</span><span class="Delimiter">)</span> &gt;&gt; <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L334" class="LineNr">334 </span>    <span class="Normal">bool</span> pnsb = <span class="Delimiter">(</span>*arg1 &amp; <span class="Constant">0x40000000</span><span class="Delimiter">);</span>
-<span id="L335" class="LineNr">335 </span>    <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>msb != pnsb<span class="Delimiter">);</span>
-<span id="L336" class="LineNr">336 </span>  <span class="Delimiter">}</span>
-<span id="L337" class="LineNr">337 </span>  <span class="Normal">uint32_t</span>* uarg1 = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint32_t</span>*&gt;<span class="Delimiter">(</span>arg1<span class="Delimiter">);</span>
-<span id="L338" class="LineNr">338 </span>  *uarg1 = <span class="Delimiter">(</span>*uarg1 &gt;&gt; count<span class="Delimiter">);</span>
-<span id="L339" class="LineNr">339 </span>  ZF = <span class="Delimiter">(</span>*uarg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L340" class="LineNr">340 </span>  <span class="Comment">// result is always positive by definition</span>
-<span id="L341" class="LineNr">341 </span>  SF =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L342" class="LineNr">342 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L433'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L343" class="LineNr">343 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L344" class="LineNr">344 </span><span class="Delimiter">}</span>
-<span id="L345" class="LineNr">345 </span>
-<span id="L346" class="LineNr">346 </span><span class="Delimiter">:(scenario shift_right_logical_odd_r32_with_cl)</span>
-<span id="L347" class="LineNr">347 </span><span class="Special">% Reg[EBX].i = 27;</span>
-<span id="L348" class="LineNr">348 </span><span class="Special">% Reg[ECX].i = 1;</span>
-<span id="L349" class="LineNr">349 </span>== <span class="Constant">0x1</span>
-<span id="L350" class="LineNr">350 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L351" class="LineNr">351 </span>  d3  eb                                      <span class="Comment"># negate EBX</span>
-<span id="L352" class="LineNr">352 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 101 (subop shift right logical) 011 (dest EBX)</span>
-<span id="L353" class="LineNr">353 </span><span class="traceContains">+run: operate on r/m32</span>
-<span id="L354" class="LineNr">354 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L355" class="LineNr">355 </span><span class="traceContains">+run: subop: shift right by CL bits, while padding zeroes</span>
-<span id="L356" class="LineNr">356 </span><span class="Comment"># result: 13</span>
-<span id="L357" class="LineNr">357 </span><span class="traceContains">+run: storing 0x0000000d</span>
+<span id="L331" class="LineNr">331 </span>  *arg1 = <span class="Delimiter">(</span>*arg1 &gt;&gt; count<span class="Delimiter">);</span>
+<span id="L332" class="LineNr">332 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L333" class="LineNr">333 </span>  SF = <span class="Delimiter">(</span>*arg1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L334" class="LineNr">334 </span>  <span class="Comment">// OF is only defined if count is 1</span>
+<span id="L335" class="LineNr">335 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>count == <span class="Constant">1</span><span class="Delimiter">)</span> <a href='010---vm.cc.html#L81'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L336" class="LineNr">336 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L440'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L337" class="LineNr">337 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L338" class="LineNr">338 </span><span class="Delimiter">}</span>
+<span id="L339" class="LineNr">339 </span>
+<span id="L340" class="LineNr">340 </span><span class="Delimiter">:(code)</span>
+<span id="L341" class="LineNr">341 </span><span class="Normal">void</span> <a href='013direct_addressing.cc.html#L341'>test_shift_right_arithmetic_odd_r32_with_cl</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L342" class="LineNr">342 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">27</span><span class="Delimiter">;</span>
+<span id="L343" class="LineNr">343 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>i = <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L344" class="LineNr">344 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L345" class="LineNr">345 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L346" class="LineNr">346 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L347" class="LineNr">347 </span>      <span class="Constant">&quot;  d3     fb                                    \n&quot;</span>  <span class="Comment">// shift EBX right by CL bits, while preserving sign</span>
+<span id="L348" class="LineNr">348 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 111 (subop shift right arithmetic) 011 (dest EBX)</span>
+<span id="L349" class="LineNr">349 </span>  <span class="Delimiter">);</span>
+<span id="L350" class="LineNr">350 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L351" class="LineNr">351 </span>      <span class="Constant">&quot;run: operate on r/m32\n&quot;</span>
+<span id="L352" class="LineNr">352 </span>      <span class="Constant">&quot;run: r/m32 is EBX\n&quot;</span>
+<span id="L353" class="LineNr">353 </span>      <span class="Constant">&quot;run: subop: shift right by CL bits, while preserving sign\n&quot;</span>
+<span id="L354" class="LineNr">354 </span>      <span class="Comment">// result: 13</span>
+<span id="L355" class="LineNr">355 </span>      <span class="Constant">&quot;run: storing 0x0000000d\n&quot;</span>
+<span id="L356" class="LineNr">356 </span>  <span class="Delimiter">);</span>
+<span id="L357" class="LineNr">357 </span><span class="Delimiter">}</span>
 <span id="L358" class="LineNr">358 </span>
-<span id="L359" class="LineNr">359 </span><span class="Delimiter">:(scenario shift_right_logical_negative_r32_with_cl)</span>
-<span id="L360" class="LineNr">360 </span><span class="Special">% Reg[EBX].i = 0xfffffffd;</span>
-<span id="L361" class="LineNr">361 </span><span class="Special">% Reg[ECX].i = 1;</span>
-<span id="L362" class="LineNr">362 </span>== <span class="Constant">0x1</span>
-<span id="L363" class="LineNr">363 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L364" class="LineNr">364 </span>  d3  eb                                      <span class="Comment"># negate EBX</span>
-<span id="L365" class="LineNr">365 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 101 (subop shift right logical) 011 (dest EBX)</span>
-<span id="L366" class="LineNr">366 </span><span class="traceContains">+run: operate on r/m32</span>
-<span id="L367" class="LineNr">367 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L368" class="LineNr">368 </span><span class="traceContains">+run: subop: shift right by CL bits, while padding zeroes</span>
-<span id="L369" class="LineNr">369 </span><span class="traceContains">+run: storing 0x7ffffffe</span>
-<span id="L370" class="LineNr">370 </span>
-<span id="L371" class="LineNr">371 </span><span class="SalientComment">//:: and</span>
-<span id="L372" class="LineNr">372 </span>
-<span id="L373" class="LineNr">373 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L374" class="LineNr">374 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;21&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise AND of r32 with rm32 (and)&quot;</span><span class="Delimiter">);</span>
-<span id="L375" class="LineNr">375 </span>
-<span id="L376" class="LineNr">376 </span><span class="Delimiter">:(scenario and_r32_with_r32)</span>
-<span id="L377" class="LineNr">377 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
-<span id="L378" class="LineNr">378 </span><span class="Special">% Reg[EBX].i = 0x000000ff;</span>
-<span id="L379" class="LineNr">379 </span>== <span class="Constant">0x1</span>
-<span id="L380" class="LineNr">380 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L381" class="LineNr">381 </span>  <span class="Constant">21</span>  d8                                      <span class="Comment"># and EBX with destination EAX</span>
-<span id="L382" class="LineNr">382 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L383" class="LineNr">383 </span><span class="traceContains">+run: and <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L384" class="LineNr">384 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L385" class="LineNr">385 </span><span class="traceContains">+run: storing 0x0000000d</span>
-<span id="L386" class="LineNr">386 </span>
-<span id="L387" class="LineNr">387 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L388" class="LineNr">388 </span><span class="Normal">case</span> <span class="Constant">0x21</span>: <span class="Delimiter">{</span>  <span class="Comment">// and r32 with r/m32</span>
-<span id="L389" class="LineNr">389 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L390" class="LineNr">390 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L391" class="LineNr">391 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L63'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L392" class="LineNr">392 </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="L393" class="LineNr">393 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L394" class="LineNr">394 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L395" class="LineNr">395 </span><span class="Delimiter">}</span>
-<span id="L396" class="LineNr">396 </span>
-<span id="L397" class="LineNr">397 </span><span class="SalientComment">//:: or</span>
-<span id="L398" class="LineNr">398 </span>
-<span id="L399" class="LineNr">399 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L400" class="LineNr">400 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;09&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise OR of r32 with rm32 (or)&quot;</span><span class="Delimiter">);</span>
-<span id="L401" class="LineNr">401 </span>
-<span id="L402" class="LineNr">402 </span><span class="Delimiter">:(scenario or_r32_with_r32)</span>
-<span id="L403" class="LineNr">403 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
-<span id="L404" class="LineNr">404 </span><span class="Special">% Reg[EBX].i = 0xa0b0c0d0;</span>
-<span id="L405" class="LineNr">405 </span>== <span class="Constant">0x1</span>
-<span id="L406" class="LineNr">406 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L407" class="LineNr">407 </span>  <span class="Error">09</span>  d8                                      <span class="Comment"># or EBX with destination EAX</span>
-<span id="L408" class="LineNr">408 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L409" class="LineNr">409 </span><span class="traceContains">+run: or <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L410" class="LineNr">410 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L411" class="LineNr">411 </span><span class="traceContains">+run: storing 0xaabbccdd</span>
-<span id="L412" class="LineNr">412 </span>
-<span id="L413" class="LineNr">413 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L414" class="LineNr">414 </span><span class="Normal">case</span> <span class="Constant">0x09</span>: <span class="Delimiter">{</span>  <span class="Comment">// or r32 with r/m32</span>
-<span id="L415" class="LineNr">415 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L416" class="LineNr">416 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L417" class="LineNr">417 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L63'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L418" class="LineNr">418 </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="L419" class="LineNr">419 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="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">//:: xor</span>
-<span id="L424" class="LineNr">424 </span>
-<span id="L425" class="LineNr">425 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L426" class="LineNr">426 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;31&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise XOR of r32 with rm32 (xor)&quot;</span><span class="Delimiter">);</span>
-<span id="L427" class="LineNr">427 </span>
-<span id="L428" class="LineNr">428 </span><span class="Delimiter">:(scenario xor_r32_with_r32)</span>
-<span id="L429" class="LineNr">429 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
-<span id="L430" class="LineNr">430 </span><span class="Special">% Reg[EBX].i = 0xaabbc0d0;</span>
-<span id="L431" class="LineNr">431 </span>== <span class="Constant">0x1</span>
-<span id="L432" class="LineNr">432 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L433" class="LineNr">433 </span>  <span class="Constant">31</span>  d8                                      <span class="Comment"># xor EBX with destination EAX</span>
-<span id="L434" class="LineNr">434 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L435" class="LineNr">435 </span><span class="traceContains">+run: xor <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L436" class="LineNr">436 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L437" class="LineNr">437 </span><span class="traceContains">+run: storing 0xa0b0ccdd</span>
-<span id="L438" class="LineNr">438 </span>
-<span id="L439" class="LineNr">439 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L440" class="LineNr">440 </span><span class="Normal">case</span> <span class="Constant">0x31</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor r32 with r/m32</span>
-<span id="L441" class="LineNr">441 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L442" class="LineNr">442 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L443" class="LineNr">443 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L63'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L444" class="LineNr">444 </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="L445" class="LineNr">445 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L446" class="LineNr">446 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L447" class="LineNr">447 </span><span class="Delimiter">}</span>
-<span id="L448" class="LineNr">448 </span>
-<span id="L449" class="LineNr">449 </span><span class="SalientComment">//:: not</span>
-<span id="L450" class="LineNr">450 </span>
-<span id="L451" class="LineNr">451 </span><span class="Delimiter">:(scenario not_r32)</span>
-<span id="L452" class="LineNr">452 </span><span class="Special">% Reg[EBX].i = 0x0f0f00ff;</span>
-<span id="L453" class="LineNr">453 </span>== <span class="Constant">0x1</span>
-<span id="L454" class="LineNr">454 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L455" class="LineNr">455 </span>  f7  d3                                      <span class="Comment"># not EBX</span>
-<span id="L456" class="LineNr">456 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 010 (subop not) 011 (dest EBX)</span>
-<span id="L457" class="LineNr">457 </span><span class="traceContains">+run: operate on r/m32</span>
-<span id="L458" class="LineNr">458 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L459" class="LineNr">459 </span><span class="traceContains">+run: subop: not</span>
-<span id="L460" class="LineNr">460 </span><span class="traceContains">+run: storing 0xf0f0ff00</span>
-<span id="L461" class="LineNr">461 </span>
-<span id="L462" class="LineNr">462 </span><span class="Delimiter">:(before &quot;End Op f7 Subops&quot;)</span>
-<span id="L463" class="LineNr">463 </span><span class="Normal">case</span> <span class="Constant">2</span>: <span class="Delimiter">{</span>  <span class="Comment">// not r/m32</span>
-<span id="L464" class="LineNr">464 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: not&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L465" class="LineNr">465 </span>  *arg1 = ~<span class="Delimiter">(</span>*arg1<span class="Delimiter">);</span>
-<span id="L466" class="LineNr">466 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L433'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L467" class="LineNr">467 </span>  SF = <span class="Delimiter">(</span>*arg1 &gt;&gt; <span class="Constant">31</span><span class="Delimiter">);</span>
-<span id="L468" class="LineNr">468 </span>  ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L469" class="LineNr">469 </span>  <a href='010---vm.cc.html#L81'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L470" class="LineNr">470 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L471" class="LineNr">471 </span><span class="Delimiter">}</span>
-<span id="L472" class="LineNr">472 </span>
-<span id="L473" class="LineNr">473 </span><span class="SalientComment">//:: compare (cmp)</span>
+<span id="L359" class="LineNr">359 </span><span class="Normal">void</span> <a href='013direct_addressing.cc.html#L359'>test_shift_right_arithmetic_negative_r32_with_cl</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L360" class="LineNr">360 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0xfffffffd</span><span class="Delimiter">;</span>  <span class="Comment">// -3</span>
+<span id="L361" class="LineNr">361 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>i = <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L362" class="LineNr">362 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L363" class="LineNr">363 </span>      <span class="Constant">&quot;== 0x1\n&quot;</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>      <span class="Constant">&quot;  d3     fb                                    \n&quot;</span>  <span class="Comment">// shift EBX right by CL bits, while preserving sign</span>
+<span id="L366" class="LineNr">366 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 111 (subop shift right arithmetic) 011 (dest EBX)</span>
+<span id="L367" class="LineNr">367 </span>  <span class="Delimiter">);</span>
+<span id="L368" class="LineNr">368 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L369" class="LineNr">369 </span>      <span class="Constant">&quot;run: operate on r/m32\n&quot;</span>
+<span id="L370" class="LineNr">370 </span>      <span class="Constant">&quot;run: r/m32 is EBX\n&quot;</span>
+<span id="L371" class="LineNr">371 </span>      <span class="Constant">&quot;run: subop: shift right by CL bits, while preserving sign\n&quot;</span>
+<span id="L372" class="LineNr">372 </span>      <span class="Comment">// result: -2</span>
+<span id="L373" class="LineNr">373 </span>      <span class="Constant">&quot;run: storing 0xfffffffe\n&quot;</span>
+<span id="L374" class="LineNr">374 </span>  <span class="Delimiter">);</span>
+<span id="L375" class="LineNr">375 </span><span class="Delimiter">}</span>
+<span id="L376" class="LineNr">376 </span>
+<span id="L377" class="LineNr">377 </span><span class="SalientComment">//:: shift right logical</span>
+<span id="L378" class="LineNr">378 </span>
+<span id="L379" class="LineNr">379 </span><span class="Delimiter">:(code)</span>
+<span id="L380" class="LineNr">380 </span><span class="Normal">void</span> <a href='013direct_addressing.cc.html#L380'>test_shift_right_logical_r32_with_cl</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L381" class="LineNr">381 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">26</span><span class="Delimiter">;</span>
+<span id="L382" class="LineNr">382 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>i = <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L383" class="LineNr">383 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L384" class="LineNr">384 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L385" class="LineNr">385 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L386" class="LineNr">386 </span>      <span class="Constant">&quot;  d3     eb                                    \n&quot;</span>  <span class="Comment">// shift EBX right by CL bits, while padding zeroes</span>
+<span id="L387" class="LineNr">387 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 101 (subop shift right logical) 011 (dest EBX)</span>
+<span id="L388" class="LineNr">388 </span>  <span class="Delimiter">);</span>
+<span id="L389" class="LineNr">389 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L390" class="LineNr">390 </span>      <span class="Constant">&quot;run: operate on r/m32\n&quot;</span>
+<span id="L391" class="LineNr">391 </span>      <span class="Constant">&quot;run: r/m32 is EBX\n&quot;</span>
+<span id="L392" class="LineNr">392 </span>      <span class="Constant">&quot;run: subop: shift right by CL bits, while padding zeroes\n&quot;</span>
+<span id="L393" class="LineNr">393 </span>      <span class="Comment">// result: 13</span>
+<span id="L394" class="LineNr">394 </span>      <span class="Constant">&quot;run: storing 0x0000000d\n&quot;</span>
+<span id="L395" class="LineNr">395 </span>  <span class="Delimiter">);</span>
+<span id="L396" class="LineNr">396 </span><span class="Delimiter">}</span>
+<span id="L397" class="LineNr">397 </span>
+<span id="L398" class="LineNr">398 </span><span class="Delimiter">:(before &quot;End Op d3 Subops&quot;)</span>
+<span id="L399" class="LineNr">399 </span><span class="Normal">case</span> <span class="Constant">5</span>: <span class="Delimiter">{</span>  <span class="Comment">// shift right r/m32 by CL, preserving sign</span>
+<span id="L400" class="LineNr">400 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: shift right by CL bits, while padding zeroes&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L401" class="LineNr">401 </span>  <span class="Normal">uint8_t</span> count = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &amp; <span class="Constant">0x1f</span><span class="Delimiter">;</span>
+<span id="L402" class="LineNr">402 </span>  <span class="Comment">// OF is only defined if count is 1</span>
+<span id="L403" class="LineNr">403 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>count == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L404" class="LineNr">404 </span>    <span class="Normal">bool</span> msb = <span class="Delimiter">(</span>*arg1 &amp; <span class="Constant">0x80000000</span><span class="Delimiter">)</span> &gt;&gt; <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L405" class="LineNr">405 </span>    <span class="Normal">bool</span> pnsb = <span class="Delimiter">(</span>*arg1 &amp; <span class="Constant">0x40000000</span><span class="Delimiter">);</span>
+<span id="L406" class="LineNr">406 </span>    <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>msb != pnsb<span class="Delimiter">);</span>
+<span id="L407" class="LineNr">407 </span>  <span class="Delimiter">}</span>
+<span id="L408" class="LineNr">408 </span>  <span class="Normal">uint32_t</span>* uarg1 = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint32_t</span>*&gt;<span class="Delimiter">(</span>arg1<span class="Delimiter">);</span>
+<span id="L409" class="LineNr">409 </span>  *uarg1 = <span class="Delimiter">(</span>*uarg1 &gt;&gt; count<span class="Delimiter">);</span>
+<span id="L410" class="LineNr">410 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Delimiter">(</span>*uarg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L411" class="LineNr">411 </span>  <span class="Comment">// result is always positive by definition</span>
+<span id="L412" class="LineNr">412 </span>  SF = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L413" class="LineNr">413 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L440'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L414" class="LineNr">414 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L415" class="LineNr">415 </span><span class="Delimiter">}</span>
+<span id="L416" class="LineNr">416 </span>
+<span id="L417" class="LineNr">417 </span><span class="Delimiter">:(code)</span>
+<span id="L418" class="LineNr">418 </span><span class="Normal">void</span> <a href='013direct_addressing.cc.html#L418'>test_shift_right_logical_odd_r32_with_cl</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L419" class="LineNr">419 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">27</span><span class="Delimiter">;</span>
+<span id="L420" class="LineNr">420 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>i = <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L421" class="LineNr">421 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L422" class="LineNr">422 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L423" class="LineNr">423 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L424" class="LineNr">424 </span>      <span class="Constant">&quot;  d3     eb                                    \n&quot;</span>  <span class="Comment">// shift EBX right by CL bits, while padding zeroes</span>
+<span id="L425" class="LineNr">425 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 101 (subop shift right logical) 011 (dest EBX)</span>
+<span id="L426" class="LineNr">426 </span>  <span class="Delimiter">);</span>
+<span id="L427" class="LineNr">427 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L428" class="LineNr">428 </span>      <span class="Constant">&quot;run: operate on r/m32\n&quot;</span>
+<span id="L429" class="LineNr">429 </span>      <span class="Constant">&quot;run: r/m32 is EBX\n&quot;</span>
+<span id="L430" class="LineNr">430 </span>      <span class="Constant">&quot;run: subop: shift right by CL bits, while padding zeroes\n&quot;</span>
+<span id="L431" class="LineNr">431 </span>      <span class="Comment">// result: 13</span>
+<span id="L432" class="LineNr">432 </span>      <span class="Constant">&quot;run: storing 0x0000000d\n&quot;</span>
+<span id="L433" class="LineNr">433 </span>  <span class="Delimiter">);</span>
+<span id="L434" class="LineNr">434 </span><span class="Delimiter">}</span>
+<span id="L435" class="LineNr">435 </span>
+<span id="L436" class="LineNr">436 </span><span class="Normal">void</span> <a href='013direct_addressing.cc.html#L436'>test_shift_right_logical_negative_r32_with_cl</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L437" class="LineNr">437 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0xfffffffd</span><span class="Delimiter">;</span>
+<span id="L438" class="LineNr">438 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>i = <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L439" class="LineNr">439 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L440" class="LineNr">440 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L441" class="LineNr">441 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L442" class="LineNr">442 </span>      <span class="Constant">&quot;  d3     eb                                    \n&quot;</span>  <span class="Comment">// shift EBX right by CL bits, while padding zeroes</span>
+<span id="L443" class="LineNr">443 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 101 (subop shift right logical) 011 (dest EBX)</span>
+<span id="L444" class="LineNr">444 </span>  <span class="Delimiter">);</span>
+<span id="L445" class="LineNr">445 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L446" class="LineNr">446 </span>      <span class="Constant">&quot;run: operate on r/m32\n&quot;</span>
+<span id="L447" class="LineNr">447 </span>      <span class="Constant">&quot;run: r/m32 is EBX\n&quot;</span>
+<span id="L448" class="LineNr">448 </span>      <span class="Constant">&quot;run: subop: shift right by CL bits, while padding zeroes\n&quot;</span>
+<span id="L449" class="LineNr">449 </span>      <span class="Constant">&quot;run: storing 0x7ffffffe\n&quot;</span>
+<span id="L450" class="LineNr">450 </span>  <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="SalientComment">//:: and</span>
+<span id="L454" class="LineNr">454 </span>
+<span id="L455" class="LineNr">455 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L456" class="LineNr">456 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;21&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise AND of r32 with rm32 (and)&quot;</span><span class="Delimiter">);</span>
+<span id="L457" class="LineNr">457 </span>
+<span id="L458" class="LineNr">458 </span><span class="Delimiter">:(code)</span>
+<span id="L459" class="LineNr">459 </span><span class="Normal">void</span> <a href='013direct_addressing.cc.html#L459'>test_and_r32_with_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L460" class="LineNr">460 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x0a0b0c0d</span><span class="Delimiter">;</span>
+<span id="L461" class="LineNr">461 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x000000ff</span><span class="Delimiter">;</span>
+<span id="L462" class="LineNr">462 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L463" class="LineNr">463 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L464" class="LineNr">464 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L465" class="LineNr">465 </span>      <span class="Constant">&quot;  21     d8                                    \n&quot;</span>  <span class="Comment">// and EBX with destination EAX</span>
+<span id="L466" class="LineNr">466 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L467" class="LineNr">467 </span>  <span class="Delimiter">);</span>
+<span id="L468" class="LineNr">468 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L469" class="LineNr">469 </span>      <span class="Constant">&quot;run: and <a href='010---vm.cc.html#L16'>EBX</a> with r/m32\n&quot;</span>
+<span id="L470" class="LineNr">470 </span>      <span class="Constant">&quot;run: r/m32 is EAX\n&quot;</span>
+<span id="L471" class="LineNr">471 </span>      <span class="Constant">&quot;run: storing 0x0000000d\n&quot;</span>
+<span id="L472" class="LineNr">472 </span>  <span class="Delimiter">);</span>
+<span id="L473" class="LineNr">473 </span><span class="Delimiter">}</span>
 <span id="L474" class="LineNr">474 </span>
-<span id="L475" class="LineNr">475 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L476" class="LineNr">476 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;39&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;compare: set SF if rm32 &lt; r32 (cmp)&quot;</span><span class="Delimiter">);</span>
-<span id="L477" class="LineNr">477 </span>
-<span id="L478" class="LineNr">478 </span><span class="Delimiter">:(scenario compare_r32_with_r32_greater)</span>
-<span id="L479" class="LineNr">479 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
-<span id="L480" class="LineNr">480 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c07;</span>
-<span id="L481" class="LineNr">481 </span>== <span class="Constant">0x1</span>
-<span id="L482" class="LineNr">482 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L483" class="LineNr">483 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
-<span id="L484" class="LineNr">484 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L485" class="LineNr">485 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L486" class="LineNr">486 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L487" class="LineNr">487 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
-<span id="L488" class="LineNr">488 </span>
-<span id="L489" class="LineNr">489 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L490" class="LineNr">490 </span><span class="Normal">case</span> <span class="Constant">0x39</span>: <span class="Delimiter">{</span>  <span class="Comment">// set SF if r/m32 &lt; r32</span>
-<span id="L491" class="LineNr">491 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L492" class="LineNr">492 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> reg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L493" class="LineNr">493 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L63'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L494" class="LineNr">494 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L495" class="LineNr">495 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L496" class="LineNr">496 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span>
-<span id="L497" class="LineNr">497 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L498" class="LineNr">498 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L499" class="LineNr">499 </span>  <span class="Normal">const</span> <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span>
-<span id="L500" class="LineNr">500 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L501" class="LineNr">501 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L81'>OF</a> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L502" class="LineNr">502 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L503" class="LineNr">503 </span><span class="Delimiter">}</span>
-<span id="L504" class="LineNr">504 </span>
-<span id="L505" class="LineNr">505 </span><span class="Delimiter">:(scenario compare_r32_with_r32_lesser)</span>
-<span id="L506" class="LineNr">506 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c07;</span>
-<span id="L507" class="LineNr">507 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
-<span id="L508" class="LineNr">508 </span>== <span class="Constant">0x1</span>
-<span id="L509" class="LineNr">509 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L510" class="LineNr">510 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
-<span id="L511" class="LineNr">511 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L512" class="LineNr">512 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L513" class="LineNr">513 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L514" class="LineNr">514 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
-<span id="L515" class="LineNr">515 </span>
-<span id="L516" class="LineNr">516 </span><span class="Delimiter">:(scenario compare_r32_with_r32_equal)</span>
-<span id="L517" class="LineNr">517 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
-<span id="L518" class="LineNr">518 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
-<span id="L519" class="LineNr">519 </span>== <span class="Constant">0x1</span>
-<span id="L520" class="LineNr">520 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L521" class="LineNr">521 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
-<span id="L522" class="LineNr">522 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L523" class="LineNr">523 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L524" class="LineNr">524 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L525" class="LineNr">525 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
-<span id="L526" class="LineNr">526 </span>
-<span id="L527" class="LineNr">527 </span><span class="SalientComment">//:: copy (mov)</span>
-<span id="L528" class="LineNr">528 </span>
-<span id="L529" class="LineNr">529 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L530" class="LineNr">530 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;89&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy r32 to rm32 (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L531" class="LineNr">531 </span>
-<span id="L532" class="LineNr">532 </span><span class="Delimiter">:(scenario copy_r32_to_r32)</span>
-<span id="L533" class="LineNr">533 </span><span class="Special">% Reg[EBX].i = 0xaf;</span>
-<span id="L534" class="LineNr">534 </span>== <span class="Constant">0x1</span>
-<span id="L535" class="LineNr">535 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L536" class="LineNr">536 </span>  <span class="Constant">89</span>  d8                                      <span class="Comment"># copy EBX to EAX</span>
-<span id="L537" class="LineNr">537 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L538" class="LineNr">538 </span><span class="traceContains">+run: copy <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L539" class="LineNr">539 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L540" class="LineNr">540 </span><span class="traceContains">+run: storing 0x000000af</span>
-<span id="L541" class="LineNr">541 </span>
-<span id="L542" class="LineNr">542 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L543" class="LineNr">543 </span><span class="Normal">case</span> <span class="Constant">0x89</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy r32 to r/m32</span>
-<span id="L544" class="LineNr">544 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L545" class="LineNr">545 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> rsrc = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L546" class="LineNr">546 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L63'>rname</a><span class="Delimiter">(</span>rsrc<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L547" class="LineNr">547 </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="L548" class="LineNr">548 </span>  *dest = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rsrc]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L549" class="LineNr">549 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L433'>HEXWORD</a> &lt;&lt; *dest &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L550" class="LineNr">550 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L551" class="LineNr">551 </span><span class="Delimiter">}</span>
-<span id="L552" class="LineNr">552 </span>
-<span id="L553" class="LineNr">553 </span><span class="SalientComment">//:: xchg</span>
-<span id="L554" class="LineNr">554 </span>
-<span id="L555" class="LineNr">555 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L556" class="LineNr">556 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;87&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;swap the <a href='003trace.cc.html#L131'>contents</a> of r32 and rm32 (xchg)&quot;</span><span class="Delimiter">);</span>
-<span id="L557" class="LineNr">557 </span>
-<span id="L558" class="LineNr">558 </span><span class="Delimiter">:(scenario xchg_r32_with_r32)</span>
-<span id="L559" class="LineNr">559 </span><span class="Special">% Reg[EBX].i = 0xaf;</span>
-<span id="L560" class="LineNr">560 </span><span class="Special">% Reg[EAX].i = 0x2e;</span>
-<span id="L561" class="LineNr">561 </span>== <span class="Constant">0x1</span>
-<span id="L562" class="LineNr">562 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L563" class="LineNr">563 </span>  <span class="Constant">87</span>  d8                                      <span class="Comment"># exchange EBX with EAX</span>
-<span id="L564" class="LineNr">564 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L565" class="LineNr">565 </span><span class="traceContains">+run: exchange <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L566" class="LineNr">566 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L567" class="LineNr">567 </span><span class="traceContains">+run: storing 0x000000af in r/m32</span>
-<span id="L568" class="LineNr">568 </span><span class="traceContains">+run: storing 0x0000002e in <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L569" class="LineNr">569 </span>
-<span id="L570" class="LineNr">570 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L571" class="LineNr">571 </span><span class="Normal">case</span> <span class="Constant">0x87</span>: <span class="Delimiter">{</span>  <span class="Comment">// exchange r32 with r/m32</span>
-<span id="L572" class="LineNr">572 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L573" class="LineNr">573 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> reg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L574" class="LineNr">574 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;exchange &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L63'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L575" class="LineNr">575 </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="L576" class="LineNr">576 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp = *arg1<span class="Delimiter">;</span>
-<span id="L577" class="LineNr">577 </span>  *arg1 = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L578" class="LineNr">578 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg2]<span class="Delimiter">.</span>i = tmp<span class="Delimiter">;</span>
-<span id="L579" class="LineNr">579 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L433'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <span class="Constant">&quot; in r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L580" class="LineNr">580 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L433'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg2]<span class="Delimiter">.</span>i &lt;&lt; <span class="Constant">&quot; in &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L63'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L581" class="LineNr">581 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L582" class="LineNr">582 </span><span class="Delimiter">}</span>
+<span id="L475" class="LineNr">475 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L476" class="LineNr">476 </span><span class="Normal">case</span> <span class="Constant">0x21</span>: <span class="Delimiter">{</span>  <span class="Comment">// and r32 with r/m32</span>
+<span id="L477" class="LineNr">477 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
+<span id="L478" class="LineNr">478 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L479" class="LineNr">479 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L73'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L480" class="LineNr">480 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L38'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L481" class="LineNr">481 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L482" class="LineNr">482 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L483" class="LineNr">483 </span><span class="Delimiter">}</span>
+<span id="L484" class="LineNr">484 </span>
+<span id="L485" class="LineNr">485 </span><span class="SalientComment">//:: or</span>
+<span id="L486" class="LineNr">486 </span>
+<span id="L487" class="LineNr">487 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L488" class="LineNr">488 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;09&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise OR of r32 with rm32 (or)&quot;</span><span class="Delimiter">);</span>
+<span id="L489" class="LineNr">489 </span>
+<span id="L490" class="LineNr">490 </span><span class="Delimiter">:(code)</span>
+<span id="L491" class="LineNr">491 </span><span class="Normal">void</span> <a href='013direct_addressing.cc.html#L491'>test_or_r32_with_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L492" class="LineNr">492 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x0a0b0c0d</span><span class="Delimiter">;</span>
+<span id="L493" class="LineNr">493 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0xa0b0c0d0</span><span class="Delimiter">;</span>
+<span id="L494" class="LineNr">494 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L495" class="LineNr">495 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L496" class="LineNr">496 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L497" class="LineNr">497 </span>      <span class="Constant">&quot;  09     d8                                    \n&quot;</span>  <span class="Comment">// or EBX with destination EAX</span>
+<span id="L498" class="LineNr">498 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L499" class="LineNr">499 </span>  <span class="Delimiter">);</span>
+<span id="L500" class="LineNr">500 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L501" class="LineNr">501 </span>      <span class="Constant">&quot;run: or <a href='010---vm.cc.html#L16'>EBX</a> with r/m32\n&quot;</span>
+<span id="L502" class="LineNr">502 </span>      <span class="Constant">&quot;run: r/m32 is EAX\n&quot;</span>
+<span id="L503" class="LineNr">503 </span>      <span class="Constant">&quot;run: storing 0xaabbccdd\n&quot;</span>
+<span id="L504" class="LineNr">504 </span>  <span class="Delimiter">);</span>
+<span id="L505" class="LineNr">505 </span><span class="Delimiter">}</span>
+<span id="L506" class="LineNr">506 </span>
+<span id="L507" class="LineNr">507 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L508" class="LineNr">508 </span><span class="Normal">case</span> <span class="Constant">0x09</span>: <span class="Delimiter">{</span>  <span class="Comment">// or r32 with r/m32</span>
+<span id="L509" class="LineNr">509 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
+<span id="L510" class="LineNr">510 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L511" class="LineNr">511 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L73'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L512" class="LineNr">512 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L38'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L513" class="LineNr">513 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L514" class="LineNr">514 </span>  <span class="Identifier">break</span><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="SalientComment">//:: xor</span>
+<span id="L518" class="LineNr">518 </span>
+<span id="L519" class="LineNr">519 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L520" class="LineNr">520 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;31&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise XOR of r32 with rm32 (xor)&quot;</span><span class="Delimiter">);</span>
+<span id="L521" class="LineNr">521 </span>
+<span id="L522" class="LineNr">522 </span><span class="Delimiter">:(code)</span>
+<span id="L523" class="LineNr">523 </span><span class="Normal">void</span> <a href='013direct_addressing.cc.html#L523'>test_xor_r32_with_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L524" class="LineNr">524 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x0a0b0c0d</span><span class="Delimiter">;</span>
+<span id="L525" class="LineNr">525 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0xaabbc0d0</span><span class="Delimiter">;</span>
+<span id="L526" class="LineNr">526 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L527" class="LineNr">527 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L528" class="LineNr">528 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L529" class="LineNr">529 </span>      <span class="Constant">&quot;  31     d8                                    \n&quot;</span>  <span class="Comment">// xor EBX with destination EAX</span>
+<span id="L530" class="LineNr">530 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L531" class="LineNr">531 </span>  <span class="Delimiter">);</span>
+<span id="L532" class="LineNr">532 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L533" class="LineNr">533 </span>      <span class="Constant">&quot;run: xor <a href='010---vm.cc.html#L16'>EBX</a> with r/m32\n&quot;</span>
+<span id="L534" class="LineNr">534 </span>      <span class="Constant">&quot;run: r/m32 is EAX\n&quot;</span>
+<span id="L535" class="LineNr">535 </span>      <span class="Constant">&quot;run: storing 0xa0b0ccdd\n&quot;</span>
+<span id="L536" class="LineNr">536 </span>  <span class="Delimiter">);</span>
+<span id="L537" class="LineNr">537 </span><span class="Delimiter">}</span>
+<span id="L538" class="LineNr">538 </span>
+<span id="L539" class="LineNr">539 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L540" class="LineNr">540 </span><span class="Normal">case</span> <span class="Constant">0x31</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor r32 with r/m32</span>
+<span id="L541" class="LineNr">541 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
+<span id="L542" class="LineNr">542 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L543" class="LineNr">543 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L73'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L544" class="LineNr">544 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L38'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L545" class="LineNr">545 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L546" class="LineNr">546 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L547" class="LineNr">547 </span><span class="Delimiter">}</span>
+<span id="L548" class="LineNr">548 </span>
+<span id="L549" class="LineNr">549 </span><span class="SalientComment">//:: not</span>
+<span id="L550" class="LineNr">550 </span>
+<span id="L551" class="LineNr">551 </span><span class="Delimiter">:(code)</span>
+<span id="L552" class="LineNr">552 </span><span class="Normal">void</span> <a href='013direct_addressing.cc.html#L552'>test_not_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L553" class="LineNr">553 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x0f0f00ff</span><span class="Delimiter">;</span>
+<span id="L554" class="LineNr">554 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L555" class="LineNr">555 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L556" class="LineNr">556 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L557" class="LineNr">557 </span>      <span class="Constant">&quot;  f7     d3                                    \n&quot;</span>  <span class="Comment">// not EBX</span>
+<span id="L558" class="LineNr">558 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 010 (subop not) 011 (dest EBX)</span>
+<span id="L559" class="LineNr">559 </span>  <span class="Delimiter">);</span>
+<span id="L560" class="LineNr">560 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L561" class="LineNr">561 </span>      <span class="Constant">&quot;run: operate on r/m32\n&quot;</span>
+<span id="L562" class="LineNr">562 </span>      <span class="Constant">&quot;run: r/m32 is EBX\n&quot;</span>
+<span id="L563" class="LineNr">563 </span>      <span class="Constant">&quot;run: subop: not\n&quot;</span>
+<span id="L564" class="LineNr">564 </span>      <span class="Constant">&quot;run: storing 0xf0f0ff00\n&quot;</span>
+<span id="L565" class="LineNr">565 </span>  <span class="Delimiter">);</span>
+<span id="L566" class="LineNr">566 </span><span class="Delimiter">}</span>
+<span id="L567" class="LineNr">567 </span>
+<span id="L568" class="LineNr">568 </span><span class="Delimiter">:(before &quot;End Op f7 Subops&quot;)</span>
+<span id="L569" class="LineNr">569 </span><span class="Normal">case</span> <span class="Constant">2</span>: <span class="Delimiter">{</span>  <span class="Comment">// not r/m32</span>
+<span id="L570" class="LineNr">570 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: not&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L571" class="LineNr">571 </span>  *arg1 = ~<span class="Delimiter">(</span>*arg1<span class="Delimiter">);</span>
+<span id="L572" class="LineNr">572 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L440'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L573" class="LineNr">573 </span>  SF = <span class="Delimiter">(</span>*arg1 &gt;&gt; <span class="Constant">31</span><span class="Delimiter">);</span>
+<span id="L574" class="LineNr">574 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L575" class="LineNr">575 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L576" class="LineNr">576 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L577" class="LineNr">577 </span><span class="Delimiter">}</span>
+<span id="L578" class="LineNr">578 </span>
+<span id="L579" class="LineNr">579 </span><span class="SalientComment">//:: compare (cmp)</span>
+<span id="L580" class="LineNr">580 </span>
+<span id="L581" class="LineNr">581 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L582" class="LineNr">582 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;39&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;compare: set SF if rm32 &lt; r32 (cmp)&quot;</span><span class="Delimiter">);</span>
 <span id="L583" class="LineNr">583 </span>
-<span id="L584" class="LineNr">584 </span><span class="SalientComment">//:: increment</span>
-<span id="L585" class="LineNr">585 </span>
-<span id="L586" class="LineNr">586 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L587" class="LineNr">587 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;40&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L13'>EAX</a> (inc)&quot;</span><span class="Delimiter">);</span>
-<span id="L588" class="LineNr">588 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;41&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L14'>ECX</a> (inc)&quot;</span><span class="Delimiter">);</span>
-<span id="L589" class="LineNr">589 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;42&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L15'>EDX</a> (inc)&quot;</span><span class="Delimiter">);</span>
-<span id="L590" class="LineNr">590 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;43&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L16'>EBX</a> (inc)&quot;</span><span class="Delimiter">);</span>
-<span id="L591" class="LineNr">591 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;44&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L17'>ESP</a> (inc)&quot;</span><span class="Delimiter">);</span>
-<span id="L592" class="LineNr">592 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;45&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L18'>EBP</a> (inc)&quot;</span><span class="Delimiter">);</span>
-<span id="L593" class="LineNr">593 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;46&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L19'>ESI</a> (inc)&quot;</span><span class="Delimiter">);</span>
-<span id="L594" class="LineNr">594 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;47&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L20'>EDI</a> (inc)&quot;</span><span class="Delimiter">);</span>
-<span id="L595" class="LineNr">595 </span>
-<span id="L596" class="LineNr">596 </span><span class="Delimiter">:(scenario increment_r32)</span>
-<span id="L597" class="LineNr">597 </span><span class="Special">% Reg[ECX].u = 0x1f;</span>
-<span id="L598" class="LineNr">598 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L599" class="LineNr">599 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L600" class="LineNr">600 </span>  <span class="Constant">41</span>                                          <span class="Comment"># increment ECX</span>
-<span id="L601" class="LineNr">601 </span><span class="traceContains">+run: increment <a href='010---vm.cc.html#L14'>ECX</a></span>
-<span id="L602" class="LineNr">602 </span><span class="traceContains">+run: storing value 0x00000020</span>
-<span id="L603" class="LineNr">603 </span>
-<span id="L604" class="LineNr">604 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L605" class="LineNr">605 </span><span class="Normal">case</span> <span class="Constant">0x40</span>:
-<span id="L606" class="LineNr">606 </span><span class="Normal">case</span> <span class="Constant">0x41</span>:
-<span id="L607" class="LineNr">607 </span><span class="Normal">case</span> <span class="Constant">0x42</span>:
-<span id="L608" class="LineNr">608 </span><span class="Normal">case</span> <span class="Constant">0x43</span>:
-<span id="L609" class="LineNr">609 </span><span class="Normal">case</span> <span class="Constant">0x44</span>:
-<span id="L610" class="LineNr">610 </span><span class="Normal">case</span> <span class="Constant">0x45</span>:
-<span id="L611" class="LineNr">611 </span><span class="Normal">case</span> <span class="Constant">0x46</span>:
-<span id="L612" class="LineNr">612 </span><span class="Normal">case</span> <span class="Constant">0x47</span>: <span class="Delimiter">{</span>  <span class="Comment">// increment r32</span>
-<span id="L613" class="LineNr">613 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L23'>reg</a> = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L614" class="LineNr">614 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;increment &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L63'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L615" class="LineNr">615 </span>  ++<span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L616" class="LineNr">616 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L617" class="LineNr">617 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L618" class="LineNr">618 </span><span class="Delimiter">}</span>
-<span id="L619" class="LineNr">619 </span>
-<span id="L620" class="LineNr">620 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L621" class="LineNr">621 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment/decrement/jump/push/call rm32 based on subop (inc/dec/jmp/push/call)&quot;</span><span class="Delimiter">);</span>
-<span id="L622" class="LineNr">622 </span>
-<span id="L623" class="LineNr">623 </span><span class="Delimiter">:(scenario increment_rm32)</span>
-<span id="L624" class="LineNr">624 </span><span class="Special">% Reg[EAX].u = 0x20;</span>
-<span id="L625" class="LineNr">625 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L626" class="LineNr">626 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L627" class="LineNr">627 </span>  ff  c0                                      <span class="Comment"># increment EAX</span>
-<span id="L628" class="LineNr">628 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 000 (subop inc) 000 (EAX)</span>
-<span id="L629" class="LineNr">629 </span><span class="traceContains">+run: increment r/m32</span>
-<span id="L630" class="LineNr">630 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L631" class="LineNr">631 </span><span class="traceContains">+run: storing value 0x00000021</span>
-<span id="L632" class="LineNr">632 </span>
-<span id="L633" class="LineNr">633 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L634" class="LineNr">634 </span><span class="Normal">case</span> <span class="Constant">0xff</span>: <span class="Delimiter">{</span>
-<span id="L635" class="LineNr">635 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L636" class="LineNr">636 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
-<span id="L637" class="LineNr">637 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L638" class="LineNr">638 </span>    <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Delimiter">{</span>  <span class="Comment">// increment r/m32</span>
-<span id="L639" class="LineNr">639 </span>      <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;increment r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L640" class="LineNr">640 </span>      <span class="Normal">int32_t</span>* <a href='001help.cc.html#L15'>arg</a> = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L641" class="LineNr">641 </span>      ++*arg<span class="Delimiter">;</span>
-<span id="L642" class="LineNr">642 </span>      <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; *arg &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L643" class="LineNr">643 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L644" class="LineNr">644 </span>    <span class="Delimiter">}</span>
-<span id="L645" class="LineNr">645 </span>    <span class="Normal">default</span>:
-<span id="L646" class="LineNr">646 </span>      cerr &lt;&lt; <span class="Constant">&quot;unrecognized subop for ff: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L432'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L647" class="LineNr">647 </span>      <a href='003trace.cc.html#L402'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L648" class="LineNr">648 </span>      exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L649" class="LineNr">649 </span>    <span class="Comment">// End Op ff Subops</span>
-<span id="L650" class="LineNr">650 </span>  <span class="Delimiter">}</span>
-<span id="L651" class="LineNr">651 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L652" class="LineNr">652 </span><span class="Delimiter">}</span>
-<span id="L653" class="LineNr">653 </span>
-<span id="L654" class="LineNr">654 </span><span class="SalientComment">//:: decrement</span>
-<span id="L655" class="LineNr">655 </span>
-<span id="L656" class="LineNr">656 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L657" class="LineNr">657 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;48&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L13'>EAX</a> (dec)&quot;</span><span class="Delimiter">);</span>
-<span id="L658" class="LineNr">658 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;49&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L14'>ECX</a> (dec)&quot;</span><span class="Delimiter">);</span>
-<span id="L659" class="LineNr">659 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L15'>EDX</a> (dec)&quot;</span><span class="Delimiter">);</span>
-<span id="L660" class="LineNr">660 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L16'>EBX</a> (dec)&quot;</span><span class="Delimiter">);</span>
-<span id="L661" class="LineNr">661 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L17'>ESP</a> (dec)&quot;</span><span class="Delimiter">);</span>
-<span id="L662" class="LineNr">662 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L18'>EBP</a> (dec)&quot;</span><span class="Delimiter">);</span>
-<span id="L663" class="LineNr">663 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L19'>ESI</a> (dec)&quot;</span><span class="Delimiter">);</span>
-<span id="L664" class="LineNr">664 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L20'>EDI</a> (dec)&quot;</span><span class="Delimiter">);</span>
-<span id="L665" class="LineNr">665 </span>
-<span id="L666" class="LineNr">666 </span><span class="Delimiter">:(scenario decrement_r32)</span>
-<span id="L667" class="LineNr">667 </span><span class="Special">% Reg[ECX].u = 0x1f;</span>
-<span id="L668" class="LineNr">668 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L669" class="LineNr">669 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L670" class="LineNr">670 </span>  <span class="Constant">49</span>                                          <span class="Comment"># decrement ECX</span>
-<span id="L671" class="LineNr">671 </span><span class="traceContains">+run: decrement <a href='010---vm.cc.html#L14'>ECX</a></span>
-<span id="L672" class="LineNr">672 </span><span class="traceContains">+run: storing value 0x0000001e</span>
-<span id="L673" class="LineNr">673 </span>
-<span id="L674" class="LineNr">674 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L675" class="LineNr">675 </span><span class="Normal">case</span> <span class="Constant">0x48</span>:
-<span id="L676" class="LineNr">676 </span><span class="Normal">case</span> <span class="Constant">0x49</span>:
-<span id="L677" class="LineNr">677 </span><span class="Normal">case</span> <span class="Constant">0x4a</span>:
-<span id="L678" class="LineNr">678 </span><span class="Normal">case</span> <span class="Constant">0x4b</span>:
-<span id="L679" class="LineNr">679 </span><span class="Normal">case</span> <span class="Constant">0x4c</span>:
-<span id="L680" class="LineNr">680 </span><span class="Normal">case</span> <span class="Constant">0x4d</span>:
-<span id="L681" class="LineNr">681 </span><span class="Normal">case</span> <span class="Constant">0x4e</span>:
-<span id="L682" class="LineNr">682 </span><span class="Normal">case</span> <span class="Constant">0x4f</span>: <span class="Delimiter">{</span>  <span class="Comment">// decrement r32</span>
-<span id="L683" class="LineNr">683 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L23'>reg</a> = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L684" class="LineNr">684 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;decrement &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L63'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L685" class="LineNr">685 </span>  --<span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L686" class="LineNr">686 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L687" class="LineNr">687 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L688" class="LineNr">688 </span><span class="Delimiter">}</span>
-<span id="L689" class="LineNr">689 </span>
-<span id="L690" class="LineNr">690 </span><span class="Delimiter">:(scenario decrement_rm32)</span>
-<span id="L691" class="LineNr">691 </span><span class="Special">% Reg[EAX].u = 0x20;</span>
-<span id="L692" class="LineNr">692 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L693" class="LineNr">693 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L694" class="LineNr">694 </span>  ff  c8                                      <span class="Comment"># decrement EAX</span>
-<span id="L695" class="LineNr">695 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 001 (subop inc) 000 (EAX)</span>
-<span id="L696" class="LineNr">696 </span><span class="traceContains">+run: decrement r/m32</span>
-<span id="L697" class="LineNr">697 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L698" class="LineNr">698 </span><span class="traceContains">+run: storing value 0x0000001f</span>
-<span id="L699" class="LineNr">699 </span>
-<span id="L700" class="LineNr">700 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
-<span id="L701" class="LineNr">701 </span><span class="Normal">case</span> <span class="Constant">1</span>: <span class="Delimiter">{</span>  <span class="Comment">// decrement r/m32</span>
-<span id="L702" class="LineNr">702 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;decrement r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L703" class="LineNr">703 </span>  <span class="Normal">int32_t</span>* <a href='001help.cc.html#L15'>arg</a> = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L704" class="LineNr">704 </span>  --*arg<span class="Delimiter">;</span>
-<span id="L705" class="LineNr">705 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; *arg &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L706" class="LineNr">706 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L707" class="LineNr">707 </span><span class="Delimiter">}</span>
-<span id="L708" class="LineNr">708 </span>
-<span id="L709" class="LineNr">709 </span><span class="SalientComment">//:: push</span>
-<span id="L710" class="LineNr">710 </span>
-<span id="L711" class="LineNr">711 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L712" class="LineNr">712 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;50&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L13'>EAX</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
-<span id="L713" class="LineNr">713 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;51&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L14'>ECX</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
-<span id="L714" class="LineNr">714 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;52&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L15'>EDX</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
-<span id="L715" class="LineNr">715 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;53&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L16'>EBX</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
-<span id="L716" class="LineNr">716 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;54&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L17'>ESP</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
-<span id="L717" class="LineNr">717 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;55&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L18'>EBP</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
-<span id="L718" class="LineNr">718 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;56&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L19'>ESI</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
-<span id="L719" class="LineNr">719 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;57&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L20'>EDI</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L584" class="LineNr">584 </span><span class="Delimiter">:(code)</span>
+<span id="L585" class="LineNr">585 </span><span class="Normal">void</span> <a href='013direct_addressing.cc.html#L585'>test_compare_r32_with_r32_greater</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L586" class="LineNr">586 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x0a0b0c0d</span><span class="Delimiter">;</span>
+<span id="L587" class="LineNr">587 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x0a0b0c07</span><span class="Delimiter">;</span>
+<span id="L588" class="LineNr">588 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L589" class="LineNr">589 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L590" class="LineNr">590 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L591" class="LineNr">591 </span>      <span class="Constant">&quot;  39     d8                                    \n&quot;</span>  <span class="Comment">// compare EBX with EAX</span>
+<span id="L592" class="LineNr">592 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L593" class="LineNr">593 </span>  <span class="Delimiter">);</span>
+<span id="L594" class="LineNr">594 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L595" class="LineNr">595 </span>      <span class="Constant">&quot;run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32\n&quot;</span>
+<span id="L596" class="LineNr">596 </span>      <span class="Constant">&quot;run: r/m32 is EAX\n&quot;</span>
+<span id="L597" class="LineNr">597 </span>      <span class="Constant">&quot;run: SF=0; ZF=0; OF=0\n&quot;</span>
+<span id="L598" class="LineNr">598 </span>  <span class="Delimiter">);</span>
+<span id="L599" class="LineNr">599 </span><span class="Delimiter">}</span>
+<span id="L600" class="LineNr">600 </span>
+<span id="L601" class="LineNr">601 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L602" class="LineNr">602 </span><span class="Normal">case</span> <span class="Constant">0x39</span>: <span class="Delimiter">{</span>  <span class="Comment">// set SF if r/m32 &lt; r32</span>
+<span id="L603" class="LineNr">603 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
+<span id="L604" class="LineNr">604 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> reg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L605" class="LineNr">605 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L73'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L606" class="LineNr">606 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L38'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L607" class="LineNr">607 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
+<span id="L608" class="LineNr">608 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span>
+<span id="L609" class="LineNr">609 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L610" class="LineNr">610 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L611" class="LineNr">611 </span>  <span class="Normal">const</span> <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span>
+<span id="L612" class="LineNr">612 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
+<span id="L613" class="LineNr">613 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L80'>ZF</a> &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L81'>OF</a> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L614" class="LineNr">614 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L615" class="LineNr">615 </span><span class="Delimiter">}</span>
+<span id="L616" class="LineNr">616 </span>
+<span id="L617" class="LineNr">617 </span><span class="Delimiter">:(code)</span>
+<span id="L618" class="LineNr">618 </span><span class="Normal">void</span> <a href='013direct_addressing.cc.html#L618'>test_compare_r32_with_r32_lesser</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L619" class="LineNr">619 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x0a0b0c07</span><span class="Delimiter">;</span>
+<span id="L620" class="LineNr">620 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x0a0b0c0d</span><span class="Delimiter">;</span>
+<span id="L621" class="LineNr">621 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L622" class="LineNr">622 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L623" class="LineNr">623 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L624" class="LineNr">624 </span>      <span class="Constant">&quot;  39     d8                                    \n&quot;</span>  <span class="Comment">// compare EBX with EAX</span>
+<span id="L625" class="LineNr">625 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L626" class="LineNr">626 </span>  <span class="Delimiter">);</span>
+<span id="L627" class="LineNr">627 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L628" class="LineNr">628 </span>      <span class="Constant">&quot;run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32\n&quot;</span>
+<span id="L629" class="LineNr">629 </span>      <span class="Constant">&quot;run: r/m32 is EAX\n&quot;</span>
+<span id="L630" class="LineNr">630 </span>      <span class="Constant">&quot;run: SF=1; ZF=0; OF=0\n&quot;</span>
+<span id="L631" class="LineNr">631 </span>  <span class="Delimiter">);</span>
+<span id="L632" class="LineNr">632 </span><span class="Delimiter">}</span>
+<span id="L633" class="LineNr">633 </span>
+<span id="L634" class="LineNr">634 </span><span class="Normal">void</span> <a href='013direct_addressing.cc.html#L634'>test_compare_r32_with_r32_equal</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L635" class="LineNr">635 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x0a0b0c0d</span><span class="Delimiter">;</span>
+<span id="L636" class="LineNr">636 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x0a0b0c0d</span><span class="Delimiter">;</span>
+<span id="L637" class="LineNr">637 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L638" class="LineNr">638 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L639" class="LineNr">639 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L640" class="LineNr">640 </span>      <span class="Constant">&quot;  39     d8                                    \n&quot;</span>  <span class="Comment">// compare EBX with EAX</span>
+<span id="L641" class="LineNr">641 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L642" class="LineNr">642 </span>  <span class="Delimiter">);</span>
+<span id="L643" class="LineNr">643 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L644" class="LineNr">644 </span>      <span class="Constant">&quot;run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32\n&quot;</span>
+<span id="L645" class="LineNr">645 </span>      <span class="Constant">&quot;run: r/m32 is EAX\n&quot;</span>
+<span id="L646" class="LineNr">646 </span>      <span class="Constant">&quot;run: SF=0; ZF=1; OF=0\n&quot;</span>
+<span id="L647" class="LineNr">647 </span>  <span class="Delimiter">);</span>
+<span id="L648" class="LineNr">648 </span><span class="Delimiter">}</span>
+<span id="L649" class="LineNr">649 </span>
+<span id="L650" class="LineNr">650 </span><span class="SalientComment">//:: copy (mov)</span>
+<span id="L651" class="LineNr">651 </span>
+<span id="L652" class="LineNr">652 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L653" class="LineNr">653 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;89&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy r32 to rm32 (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L654" class="LineNr">654 </span>
+<span id="L655" class="LineNr">655 </span><span class="Delimiter">:(code)</span>
+<span id="L656" class="LineNr">656 </span><span class="Normal">void</span> <a href='013direct_addressing.cc.html#L656'>test_copy_r32_to_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L657" class="LineNr">657 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0xaf</span><span class="Delimiter">;</span>
+<span id="L658" class="LineNr">658 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L659" class="LineNr">659 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L660" class="LineNr">660 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L661" class="LineNr">661 </span>      <span class="Constant">&quot;  89     d8                                    \n&quot;</span>  <span class="Comment">// copy EBX to EAX</span>
+<span id="L662" class="LineNr">662 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L663" class="LineNr">663 </span>  <span class="Delimiter">);</span>
+<span id="L664" class="LineNr">664 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L665" class="LineNr">665 </span>      <span class="Constant">&quot;run: copy <a href='010---vm.cc.html#L16'>EBX</a> to r/m32\n&quot;</span>
+<span id="L666" class="LineNr">666 </span>      <span class="Constant">&quot;run: r/m32 is EAX\n&quot;</span>
+<span id="L667" class="LineNr">667 </span>      <span class="Constant">&quot;run: storing 0x000000af\n&quot;</span>
+<span id="L668" class="LineNr">668 </span>  <span class="Delimiter">);</span>
+<span id="L669" class="LineNr">669 </span><span class="Delimiter">}</span>
+<span id="L670" class="LineNr">670 </span>
+<span id="L671" class="LineNr">671 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L672" class="LineNr">672 </span><span class="Normal">case</span> <span class="Constant">0x89</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy r32 to r/m32</span>
+<span id="L673" class="LineNr">673 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
+<span id="L674" class="LineNr">674 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> rsrc = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L675" class="LineNr">675 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L73'>rname</a><span class="Delimiter">(</span>rsrc<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L676" class="LineNr">676 </span>  <span class="Normal">int32_t</span>* dest = <a href='013direct_addressing.cc.html#L38'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L677" class="LineNr">677 </span>  *dest = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rsrc]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
+<span id="L678" class="LineNr">678 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L440'>HEXWORD</a> &lt;&lt; *dest &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L679" class="LineNr">679 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L680" class="LineNr">680 </span><span class="Delimiter">}</span>
+<span id="L681" class="LineNr">681 </span>
+<span id="L682" class="LineNr">682 </span><span class="SalientComment">//:: xchg</span>
+<span id="L683" class="LineNr">683 </span>
+<span id="L684" class="LineNr">684 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L685" class="LineNr">685 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;87&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;swap the <a href='003trace.cc.html#L117'>contents</a> of r32 and rm32 (xchg)&quot;</span><span class="Delimiter">);</span>
+<span id="L686" class="LineNr">686 </span>
+<span id="L687" class="LineNr">687 </span><span class="Delimiter">:(code)</span>
+<span id="L688" class="LineNr">688 </span><span class="Normal">void</span> <a href='013direct_addressing.cc.html#L688'>test_xchg_r32_with_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L689" class="LineNr">689 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0xaf</span><span class="Delimiter">;</span>
+<span id="L690" class="LineNr">690 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x2e</span><span class="Delimiter">;</span>
+<span id="L691" class="LineNr">691 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L692" class="LineNr">692 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L693" class="LineNr">693 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L694" class="LineNr">694 </span>      <span class="Constant">&quot;  87     d8                                    \n&quot;</span>  <span class="Comment">// exchange EBX with EAX</span>
+<span id="L695" class="LineNr">695 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L696" class="LineNr">696 </span>  <span class="Delimiter">);</span>
+<span id="L697" class="LineNr">697 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L698" class="LineNr">698 </span>      <span class="Constant">&quot;run: exchange <a href='010---vm.cc.html#L16'>EBX</a> with r/m32\n&quot;</span>
+<span id="L699" class="LineNr">699 </span>      <span class="Constant">&quot;run: r/m32 is EAX\n&quot;</span>
+<span id="L700" class="LineNr">700 </span>      <span class="Constant">&quot;run: storing 0x000000af in r/m32\n&quot;</span>
+<span id="L701" class="LineNr">701 </span>      <span class="Constant">&quot;run: storing 0x0000002e in EBX\n&quot;</span>
+<span id="L702" class="LineNr">702 </span>  <span class="Delimiter">);</span>
+<span id="L703" class="LineNr">703 </span><span class="Delimiter">}</span>
+<span id="L704" class="LineNr">704 </span>
+<span id="L705" class="LineNr">705 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L706" class="LineNr">706 </span><span class="Normal">case</span> <span class="Constant">0x87</span>: <span class="Delimiter">{</span>  <span class="Comment">// exchange r32 with r/m32</span>
+<span id="L707" class="LineNr">707 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
+<span id="L708" class="LineNr">708 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> reg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L709" class="LineNr">709 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;exchange &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L73'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L710" class="LineNr">710 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L38'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L711" class="LineNr">711 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp = *arg1<span class="Delimiter">;</span>
+<span id="L712" class="LineNr">712 </span>  *arg1 = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
+<span id="L713" class="LineNr">713 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg2]<span class="Delimiter">.</span>i = tmp<span class="Delimiter">;</span>
+<span id="L714" class="LineNr">714 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L440'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <span class="Constant">&quot; in r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L715" class="LineNr">715 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L440'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg2]<span class="Delimiter">.</span>i &lt;&lt; <span class="Constant">&quot; in &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L73'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L716" class="LineNr">716 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L717" class="LineNr">717 </span><span class="Delimiter">}</span>
+<span id="L718" class="LineNr">718 </span>
+<span id="L719" class="LineNr">719 </span><span class="SalientComment">//:: increment</span>
 <span id="L720" class="LineNr">720 </span>
-<span id="L721" class="LineNr">721 </span><span class="Delimiter">:(scenario push_r32)</span>
-<span id="L722" class="LineNr">722 </span><span class="Special">% Reg[ESP].u = 0x64;</span>
-<span id="L723" class="LineNr">723 </span><span class="Special">% Reg[EBX].i = 0x0000000a;</span>
-<span id="L724" class="LineNr">724 </span>== <span class="Constant">0x1</span>
-<span id="L725" class="LineNr">725 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L726" class="LineNr">726 </span>  <span class="Constant">53</span>                                          <span class="Comment"># push EBX to stack</span>
-<span id="L727" class="LineNr">727 </span><span class="traceContains">+run: <a href='012elf.cc.html#L90'>push</a> <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L728" class="LineNr">728 </span><span class="traceContains">+run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000060</span>
-<span id="L729" class="LineNr">729 </span><span class="traceContains">+run: pushing value 0x0000000a</span>
+<span id="L721" class="LineNr">721 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L722" class="LineNr">722 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;40&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L13'>EAX</a> (inc)&quot;</span><span class="Delimiter">);</span>
+<span id="L723" class="LineNr">723 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;41&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L14'>ECX</a> (inc)&quot;</span><span class="Delimiter">);</span>
+<span id="L724" class="LineNr">724 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;42&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L15'>EDX</a> (inc)&quot;</span><span class="Delimiter">);</span>
+<span id="L725" class="LineNr">725 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;43&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L16'>EBX</a> (inc)&quot;</span><span class="Delimiter">);</span>
+<span id="L726" class="LineNr">726 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;44&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L17'>ESP</a> (inc)&quot;</span><span class="Delimiter">);</span>
+<span id="L727" class="LineNr">727 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;45&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L18'>EBP</a> (inc)&quot;</span><span class="Delimiter">);</span>
+<span id="L728" class="LineNr">728 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;46&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L19'>ESI</a> (inc)&quot;</span><span class="Delimiter">);</span>
+<span id="L729" class="LineNr">729 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;47&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L20'>EDI</a> (inc)&quot;</span><span class="Delimiter">);</span>
 <span id="L730" class="LineNr">730 </span>
-<span id="L731" class="LineNr">731 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L732" class="LineNr">732 </span><span class="Normal">case</span> <span class="Constant">0x50</span>:
-<span id="L733" class="LineNr">733 </span><span class="Normal">case</span> <span class="Constant">0x51</span>:
-<span id="L734" class="LineNr">734 </span><span class="Normal">case</span> <span class="Constant">0x52</span>:
-<span id="L735" class="LineNr">735 </span><span class="Normal">case</span> <span class="Constant">0x53</span>:
-<span id="L736" class="LineNr">736 </span><span class="Normal">case</span> <span class="Constant">0x54</span>:
-<span id="L737" class="LineNr">737 </span><span class="Normal">case</span> <span class="Constant">0x55</span>:
-<span id="L738" class="LineNr">738 </span><span class="Normal">case</span> <span class="Constant">0x56</span>:
-<span id="L739" class="LineNr">739 </span><span class="Normal">case</span> <span class="Constant">0x57</span>: <span class="Delimiter">{</span>  <span class="Comment">// push r32 to stack</span>
-<span id="L740" class="LineNr">740 </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="L741" class="LineNr">741 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L63'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L742" class="LineNr">742 </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="L743" class="LineNr">743 </span>  <a href='012elf.cc.html#L90'>push</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L744" class="LineNr">744 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L745" class="LineNr">745 </span><span class="Delimiter">}</span>
-<span id="L746" class="LineNr">746 </span>
-<span id="L747" class="LineNr">747 </span><span class="SalientComment">//:: pop</span>
-<span id="L748" class="LineNr">748 </span>
-<span id="L749" class="LineNr">749 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L750" class="LineNr">750 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;58&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L13'>EAX</a> (pop)&quot;</span><span class="Delimiter">);</span>
-<span id="L751" class="LineNr">751 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;59&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L14'>ECX</a> (pop)&quot;</span><span class="Delimiter">);</span>
-<span id="L752" class="LineNr">752 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L15'>EDX</a> (pop)&quot;</span><span class="Delimiter">);</span>
-<span id="L753" class="LineNr">753 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L16'>EBX</a> (pop)&quot;</span><span class="Delimiter">);</span>
-<span id="L754" class="LineNr">754 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L17'>ESP</a> (pop)&quot;</span><span class="Delimiter">);</span>
-<span id="L755" class="LineNr">755 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L18'>EBP</a> (pop)&quot;</span><span class="Delimiter">);</span>
-<span id="L756" class="LineNr">756 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L19'>ESI</a> (pop)&quot;</span><span class="Delimiter">);</span>
-<span id="L757" class="LineNr">757 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L20'>EDI</a> (pop)&quot;</span><span class="Delimiter">);</span>
-<span id="L758" class="LineNr">758 </span>
-<span id="L759" class="LineNr">759 </span><span class="Delimiter">:(scenario pop_r32)</span>
-<span id="L760" class="LineNr">760 </span><span class="Special">% Reg[ESP].u = 0x02000000;</span>
-<span id="L761" class="LineNr">761 </span><span class="Special">% Mem.push_back(vma(0x02000000));  // manually allocate memory</span>
-<span id="L762" class="LineNr">762 </span><span class="Special">% write_mem_i32(0x02000000, 0x0000000a);  // ..before this write</span>
-<span id="L763" class="LineNr">763 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L764" class="LineNr">764 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L765" class="LineNr">765 </span>  5b                                          <span class="Comment"># pop stack to EBX</span>
-<span id="L766" class="LineNr">766 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L767" class="LineNr">767 </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="L768" class="LineNr">768 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L789'>pop</a> into <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L769" class="LineNr">769 </span><span class="traceContains">+run: popping value 0x0000000a</span>
-<span id="L770" class="LineNr">770 </span><span class="traceContains">+run: incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x02000004</span>
-<span id="L771" class="LineNr">771 </span>
-<span id="L772" class="LineNr">772 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L773" class="LineNr">773 </span><span class="Normal">case</span> <span class="Constant">0x58</span>:
-<span id="L774" class="LineNr">774 </span><span class="Normal">case</span> <span class="Constant">0x59</span>:
-<span id="L775" class="LineNr">775 </span><span class="Normal">case</span> <span class="Constant">0x5a</span>:
-<span id="L776" class="LineNr">776 </span><span class="Normal">case</span> <span class="Constant">0x5b</span>:
-<span id="L777" class="LineNr">777 </span><span class="Normal">case</span> <span class="Constant">0x5c</span>:
-<span id="L778" class="LineNr">778 </span><span class="Normal">case</span> <span class="Constant">0x5d</span>:
-<span id="L779" class="LineNr">779 </span><span class="Normal">case</span> <span class="Constant">0x5e</span>:
-<span id="L780" class="LineNr">780 </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="L781" class="LineNr">781 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L23'>reg</a> = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L782" class="LineNr">782 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L63'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L783" class="LineNr">783 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;pop from &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
-<span id="L784" class="LineNr">784 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u = <a href='013direct_addressing.cc.html#L789'>pop</a><span class="Delimiter">();</span>
-<span id="L785" class="LineNr">785 </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="L786" class="LineNr">786 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L787" class="LineNr">787 </span><span class="Delimiter">}</span>
-<span id="L788" class="LineNr">788 </span><span class="Delimiter">:(code)</span>
-<span id="L789" class="LineNr">789 </span><span class="Normal">uint32_t</span> <a href='013direct_addressing.cc.html#L789'>pop</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L790" class="LineNr">790 </span>  <span class="Normal">const</span> <span class="Normal">uint32_t</span> result = <a href='010---vm.cc.html#L209'>read_mem_u32</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L791" class="LineNr">791 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L433'>HEXWORD</a> &lt;&lt; result &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L792" class="LineNr">792 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u += <span class="Constant">4</span><span class="Delimiter">;</span>
-<span id="L793" class="LineNr">793 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L433'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L794" class="LineNr">794 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L795" class="LineNr">795 </span><span class="Delimiter">}</span>
+<span id="L731" class="LineNr">731 </span><span class="Delimiter">:(code)</span>
+<span id="L732" class="LineNr">732 </span><span class="Normal">void</span> <a href='013direct_addressing.cc.html#L732'>test_increment_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L733" class="LineNr">733 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u = <span class="Constant">0x1f</span><span class="Delimiter">;</span>
+<span id="L734" class="LineNr">734 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L735" class="LineNr">735 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L736" class="LineNr">736 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L737" class="LineNr">737 </span>      <span class="Constant">&quot;  41                                           \n&quot;</span>  <span class="Comment">// increment ECX</span>
+<span id="L738" class="LineNr">738 </span>  <span class="Delimiter">);</span>
+<span id="L739" class="LineNr">739 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L740" class="LineNr">740 </span>      <span class="Constant">&quot;run: increment ECX\n&quot;</span>
+<span id="L741" class="LineNr">741 </span>      <span class="Constant">&quot;run: storing value 0x00000020\n&quot;</span>
+<span id="L742" class="LineNr">742 </span>  <span class="Delimiter">);</span>
+<span id="L743" class="LineNr">743 </span><span class="Delimiter">}</span>
+<span id="L744" class="LineNr">744 </span>
+<span id="L745" class="LineNr">745 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L746" class="LineNr">746 </span><span class="Normal">case</span> <span class="Constant">0x40</span>:
+<span id="L747" class="LineNr">747 </span><span class="Normal">case</span> <span class="Constant">0x41</span>:
+<span id="L748" class="LineNr">748 </span><span class="Normal">case</span> <span class="Constant">0x42</span>:
+<span id="L749" class="LineNr">749 </span><span class="Normal">case</span> <span class="Constant">0x43</span>:
+<span id="L750" class="LineNr">750 </span><span class="Normal">case</span> <span class="Constant">0x44</span>:
+<span id="L751" class="LineNr">751 </span><span class="Normal">case</span> <span class="Constant">0x45</span>:
+<span id="L752" class="LineNr">752 </span><span class="Normal">case</span> <span class="Constant">0x46</span>:
+<span id="L753" class="LineNr">753 </span><span class="Normal">case</span> <span class="Constant">0x47</span>: <span class="Delimiter">{</span>  <span class="Comment">// increment r32</span>
+<span id="L754" class="LineNr">754 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L23'>reg</a> = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L755" class="LineNr">755 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;increment &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L73'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L756" class="LineNr">756 </span>  ++<span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
+<span id="L757" class="LineNr">757 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L758" class="LineNr">758 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L759" class="LineNr">759 </span><span class="Delimiter">}</span>
+<span id="L760" class="LineNr">760 </span>
+<span id="L761" class="LineNr">761 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L762" class="LineNr">762 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment/decrement/jump/push/call rm32 based on subop (inc/dec/jmp/push/call)&quot;</span><span class="Delimiter">);</span>
+<span id="L763" class="LineNr">763 </span>
+<span id="L764" class="LineNr">764 </span><span class="Delimiter">:(code)</span>
+<span id="L765" class="LineNr">765 </span><span class="Normal">void</span> <a href='013direct_addressing.cc.html#L765'>test_increment_rm32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L766" class="LineNr">766 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>u = <span class="Constant">0x20</span><span class="Delimiter">;</span>
+<span id="L767" class="LineNr">767 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L768" class="LineNr">768 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L769" class="LineNr">769 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L770" class="LineNr">770 </span>      <span class="Constant">&quot;  ff     c0                                    \n&quot;</span>  <span class="Comment">// increment EAX</span>
+<span id="L771" class="LineNr">771 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 000 (subop inc) 000 (EAX)</span>
+<span id="L772" class="LineNr">772 </span>  <span class="Delimiter">);</span>
+<span id="L773" class="LineNr">773 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L774" class="LineNr">774 </span>      <span class="Constant">&quot;run: increment r/m32\n&quot;</span>
+<span id="L775" class="LineNr">775 </span>      <span class="Constant">&quot;run: r/m32 is EAX\n&quot;</span>
+<span id="L776" class="LineNr">776 </span>      <span class="Constant">&quot;run: storing value 0x00000021\n&quot;</span>
+<span id="L777" class="LineNr">777 </span>  <span class="Delimiter">);</span>
+<span id="L778" class="LineNr">778 </span><span class="Delimiter">}</span>
+<span id="L779" class="LineNr">779 </span>
+<span id="L780" class="LineNr">780 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L781" class="LineNr">781 </span><span class="Normal">case</span> <span class="Constant">0xff</span>: <span class="Delimiter">{</span>
+<span id="L782" class="LineNr">782 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
+<span id="L783" class="LineNr">783 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
+<span id="L784" class="LineNr">784 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L785" class="LineNr">785 </span>    <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Delimiter">{</span>  <span class="Comment">// increment r/m32</span>
+<span id="L786" class="LineNr">786 </span>      <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;increment r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L787" class="LineNr">787 </span>      <span class="Normal">int32_t</span>* <a href='001help.cc.html#L15'>arg</a> = <a href='013direct_addressing.cc.html#L38'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L788" class="LineNr">788 </span>      ++*arg<span class="Delimiter">;</span>
+<span id="L789" class="LineNr">789 </span>      <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; *arg &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L790" class="LineNr">790 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L791" class="LineNr">791 </span>    <span class="Delimiter">}</span>
+<span id="L792" class="LineNr">792 </span>    <span class="Normal">default</span>:
+<span id="L793" class="LineNr">793 </span>      cerr &lt;&lt; <span class="Constant">&quot;unrecognized subop for ff: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L439'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L794" class="LineNr">794 </span>      <a href='003trace.cc.html#L410'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L795" class="LineNr">795 </span>      exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L796" class="LineNr">796 </span>    <span class="Comment">// End Op ff Subops</span>
+<span id="L797" class="LineNr">797 </span>  <span class="Delimiter">}</span>
+<span id="L798" class="LineNr">798 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L799" class="LineNr">799 </span><span class="Delimiter">}</span>
+<span id="L800" class="LineNr">800 </span>
+<span id="L801" class="LineNr">801 </span><span class="SalientComment">//:: decrement</span>
+<span id="L802" class="LineNr">802 </span>
+<span id="L803" class="LineNr">803 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L804" class="LineNr">804 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;48&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L13'>EAX</a> (dec)&quot;</span><span class="Delimiter">);</span>
+<span id="L805" class="LineNr">805 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;49&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L14'>ECX</a> (dec)&quot;</span><span class="Delimiter">);</span>
+<span id="L806" class="LineNr">806 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L15'>EDX</a> (dec)&quot;</span><span class="Delimiter">);</span>
+<span id="L807" class="LineNr">807 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L16'>EBX</a> (dec)&quot;</span><span class="Delimiter">);</span>
+<span id="L808" class="LineNr">808 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L17'>ESP</a> (dec)&quot;</span><span class="Delimiter">);</span>
+<span id="L809" class="LineNr">809 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L18'>EBP</a> (dec)&quot;</span><span class="Delimiter">);</span>
+<span id="L810" class="LineNr">810 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L19'>ESI</a> (dec)&quot;</span><span class="Delimiter">);</span>
+<span id="L811" class="LineNr">811 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L20'>EDI</a> (dec)&quot;</span><span class="Delimiter">);</span>
+<span id="L812" class="LineNr">812 </span>
+<span id="L813" class="LineNr">813 </span><span class="Delimiter">:(code)</span>
+<span id="L814" class="LineNr">814 </span><span class="Normal">void</span> <a href='013direct_addressing.cc.html#L814'>test_decrement_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L815" class="LineNr">815 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u = <span class="Constant">0x1f</span><span class="Delimiter">;</span>
+<span id="L816" class="LineNr">816 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L817" class="LineNr">817 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L818" class="LineNr">818 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L819" class="LineNr">819 </span>      <span class="Constant">&quot;  49                                           \n&quot;</span>  <span class="Comment">// decrement ECX</span>
+<span id="L820" class="LineNr">820 </span>  <span class="Delimiter">);</span>
+<span id="L821" class="LineNr">821 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L822" class="LineNr">822 </span>      <span class="Constant">&quot;run: decrement ECX\n&quot;</span>
+<span id="L823" class="LineNr">823 </span>      <span class="Constant">&quot;run: storing value 0x0000001e\n&quot;</span>
+<span id="L824" class="LineNr">824 </span>  <span class="Delimiter">);</span>
+<span id="L825" class="LineNr">825 </span><span class="Delimiter">}</span>
+<span id="L826" class="LineNr">826 </span>
+<span id="L827" class="LineNr">827 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L828" class="LineNr">828 </span><span class="Normal">case</span> <span class="Constant">0x48</span>:
+<span id="L829" class="LineNr">829 </span><span class="Normal">case</span> <span class="Constant">0x49</span>:
+<span id="L830" class="LineNr">830 </span><span class="Normal">case</span> <span class="Constant">0x4a</span>:
+<span id="L831" class="LineNr">831 </span><span class="Normal">case</span> <span class="Constant">0x4b</span>:
+<span id="L832" class="LineNr">832 </span><span class="Normal">case</span> <span class="Constant">0x4c</span>:
+<span id="L833" class="LineNr">833 </span><span class="Normal">case</span> <span class="Constant">0x4d</span>:
+<span id="L834" class="LineNr">834 </span><span class="Normal">case</span> <span class="Constant">0x4e</span>:
+<span id="L835" class="LineNr">835 </span><span class="Normal">case</span> <span class="Constant">0x4f</span>: <span class="Delimiter">{</span>  <span class="Comment">// decrement r32</span>
+<span id="L836" class="LineNr">836 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L23'>reg</a> = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L837" class="LineNr">837 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;decrement &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L73'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L838" class="LineNr">838 </span>  --<span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
+<span id="L839" class="LineNr">839 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L840" class="LineNr">840 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L841" class="LineNr">841 </span><span class="Delimiter">}</span>
+<span id="L842" class="LineNr">842 </span>
+<span id="L843" class="LineNr">843 </span><span class="Delimiter">:(code)</span>
+<span id="L844" class="LineNr">844 </span><span class="Normal">void</span> <a href='013direct_addressing.cc.html#L844'>test_decrement_rm32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L845" class="LineNr">845 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>u = <span class="Constant">0x20</span><span class="Delimiter">;</span>
+<span id="L846" class="LineNr">846 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L847" class="LineNr">847 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L848" class="LineNr">848 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L849" class="LineNr">849 </span>      <span class="Constant">&quot;  ff     c8                                    \n&quot;</span>  <span class="Comment">// decrement EAX</span>
+<span id="L850" class="LineNr">850 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 001 (subop inc) 000 (EAX)</span>
+<span id="L851" class="LineNr">851 </span>  <span class="Delimiter">);</span>
+<span id="L852" class="LineNr">852 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L853" class="LineNr">853 </span>      <span class="Constant">&quot;run: decrement r/m32\n&quot;</span>
+<span id="L854" class="LineNr">854 </span>      <span class="Constant">&quot;run: r/m32 is EAX\n&quot;</span>
+<span id="L855" class="LineNr">855 </span>      <span class="Constant">&quot;run: storing value 0x0000001f\n&quot;</span>
+<span id="L856" class="LineNr">856 </span>  <span class="Delimiter">);</span>
+<span id="L857" class="LineNr">857 </span><span class="Delimiter">}</span>
+<span id="L858" class="LineNr">858 </span>
+<span id="L859" class="LineNr">859 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
+<span id="L860" class="LineNr">860 </span><span class="Normal">case</span> <span class="Constant">1</span>: <span class="Delimiter">{</span>  <span class="Comment">// decrement r/m32</span>
+<span id="L861" class="LineNr">861 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;decrement r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L862" class="LineNr">862 </span>  <span class="Normal">int32_t</span>* <a href='001help.cc.html#L15'>arg</a> = <a href='013direct_addressing.cc.html#L38'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L863" class="LineNr">863 </span>  --*arg<span class="Delimiter">;</span>
+<span id="L864" class="LineNr">864 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; *arg &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L865" class="LineNr">865 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L866" class="LineNr">866 </span><span class="Delimiter">}</span>
+<span id="L867" class="LineNr">867 </span>
+<span id="L868" class="LineNr">868 </span><span class="SalientComment">//:: push</span>
+<span id="L869" class="LineNr">869 </span>
+<span id="L870" class="LineNr">870 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L871" class="LineNr">871 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;50&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L13'>EAX</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L872" class="LineNr">872 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;51&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L14'>ECX</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L873" class="LineNr">873 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;52&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L15'>EDX</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L874" class="LineNr">874 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;53&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L16'>EBX</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L875" class="LineNr">875 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;54&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L17'>ESP</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L876" class="LineNr">876 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;55&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L18'>EBP</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L877" class="LineNr">877 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;56&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L19'>ESI</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L878" class="LineNr">878 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;57&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L20'>EDI</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L879" class="LineNr">879 </span>
+<span id="L880" class="LineNr">880 </span><span class="Delimiter">:(code)</span>
+<span id="L881" class="LineNr">881 </span><span class="Normal">void</span> <a href='013direct_addressing.cc.html#L881'>test_push_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L882" class="LineNr">882 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u = <span class="Constant">0x64</span><span class="Delimiter">;</span>
+<span id="L883" class="LineNr">883 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x0000000a</span><span class="Delimiter">;</span>
+<span id="L884" class="LineNr">884 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L885" class="LineNr">885 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L886" class="LineNr">886 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L887" class="LineNr">887 </span>      <span class="Constant">&quot;  53                                           \n&quot;</span>  <span class="Comment">// push EBX to stack</span>
+<span id="L888" class="LineNr">888 </span>  <span class="Delimiter">);</span>
+<span id="L889" class="LineNr">889 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L890" class="LineNr">890 </span>      <span class="Constant">&quot;run: <a href='012elf.cc.html#L90'>push</a> EBX\n&quot;</span>
+<span id="L891" class="LineNr">891 </span>      <span class="Constant">&quot;run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000060\n&quot;</span>
+<span id="L892" class="LineNr">892 </span>      <span class="Constant">&quot;run: pushing value 0x0000000a\n&quot;</span>
+<span id="L893" class="LineNr">893 </span>  <span class="Delimiter">);</span>
+<span id="L894" class="LineNr">894 </span><span class="Delimiter">}</span>
+<span id="L895" class="LineNr">895 </span>
+<span id="L896" class="LineNr">896 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L897" class="LineNr">897 </span><span class="Normal">case</span> <span class="Constant">0x50</span>:
+<span id="L898" class="LineNr">898 </span><span class="Normal">case</span> <span class="Constant">0x51</span>:
+<span id="L899" class="LineNr">899 </span><span class="Normal">case</span> <span class="Constant">0x52</span>:
+<span id="L900" class="LineNr">900 </span><span class="Normal">case</span> <span class="Constant">0x53</span>:
+<span id="L901" class="LineNr">901 </span><span class="Normal">case</span> <span class="Constant">0x54</span>:
+<span id="L902" class="LineNr">902 </span><span class="Normal">case</span> <span class="Constant">0x55</span>:
+<span id="L903" class="LineNr">903 </span><span class="Normal">case</span> <span class="Constant">0x56</span>:
+<span id="L904" class="LineNr">904 </span><span class="Normal">case</span> <span class="Constant">0x57</span>: <span class="Delimiter">{</span>  <span class="Comment">// push r32 to stack</span>
+<span id="L905" class="LineNr">905 </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="L906" class="LineNr">906 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L73'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L907" class="LineNr">907 </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="L908" class="LineNr">908 </span>  <a href='012elf.cc.html#L90'>push</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L909" class="LineNr">909 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L910" class="LineNr">910 </span><span class="Delimiter">}</span>
+<span id="L911" class="LineNr">911 </span>
+<span id="L912" class="LineNr">912 </span><span class="SalientComment">//:: pop</span>
+<span id="L913" class="LineNr">913 </span>
+<span id="L914" class="LineNr">914 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L915" class="LineNr">915 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;58&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L13'>EAX</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L916" class="LineNr">916 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;59&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L14'>ECX</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L917" class="LineNr">917 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L15'>EDX</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L918" class="LineNr">918 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L16'>EBX</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L919" class="LineNr">919 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L17'>ESP</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L920" class="LineNr">920 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L18'>EBP</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L921" class="LineNr">921 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L19'>ESI</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L922" class="LineNr">922 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L20'>EDI</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L923" class="LineNr">923 </span>
+<span id="L924" class="LineNr">924 </span><span class="Delimiter">:(code)</span>
+<span id="L925" class="LineNr">925 </span><span class="Normal">void</span> <a href='013direct_addressing.cc.html#L925'>test_pop_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L926" class="LineNr">926 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u = <span class="Constant">0x02000000</span><span class="Delimiter">;</span>
+<span id="L927" class="LineNr">927 </span>  <span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>vma<span class="Delimiter">(</span><span class="Constant">0x02000000</span><span class="Delimiter">));</span>  <span class="Comment">// manually allocate memory</span>
+<span id="L928" class="LineNr">928 </span>  <a href='010---vm.cc.html#L275'>write_mem_i32</a><span class="Delimiter">(</span><span class="Constant">0x02000000</span><span class="Delimiter">,</span> <span class="Constant">0x0000000a</span><span class="Delimiter">);</span>  <span class="Comment">// ..before this write</span>
+<span id="L929" class="LineNr">929 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L930" class="LineNr">930 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L931" class="LineNr">931 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L932" class="LineNr">932 </span>      <span class="Constant">&quot;  5b                                           \n&quot;</span>  <span class="Comment">// pop stack to EBX</span>
+<span id="L933" class="LineNr">933 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L934" class="LineNr">934 </span>      <span class="Constant">&quot;0a 00 00 00\n&quot;</span>  <span class="Comment">// 0x0000000a</span>
+<span id="L935" class="LineNr">935 </span>  <span class="Delimiter">);</span>
+<span id="L936" class="LineNr">936 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L937" class="LineNr">937 </span>      <span class="Constant">&quot;run: <a href='013direct_addressing.cc.html#L960'>pop</a> into EBX\n&quot;</span>
+<span id="L938" class="LineNr">938 </span>      <span class="Constant">&quot;run: popping value 0x0000000a\n&quot;</span>
+<span id="L939" class="LineNr">939 </span>      <span class="Constant">&quot;run: incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x02000004\n&quot;</span>
+<span id="L940" class="LineNr">940 </span>  <span class="Delimiter">);</span>
+<span id="L941" class="LineNr">941 </span><span class="Delimiter">}</span>
+<span id="L942" class="LineNr">942 </span>
+<span id="L943" class="LineNr">943 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L944" class="LineNr">944 </span><span class="Normal">case</span> <span class="Constant">0x58</span>:
+<span id="L945" class="LineNr">945 </span><span class="Normal">case</span> <span class="Constant">0x59</span>:
+<span id="L946" class="LineNr">946 </span><span class="Normal">case</span> <span class="Constant">0x5a</span>:
+<span id="L947" class="LineNr">947 </span><span class="Normal">case</span> <span class="Constant">0x5b</span>:
+<span id="L948" class="LineNr">948 </span><span class="Normal">case</span> <span class="Constant">0x5c</span>:
+<span id="L949" class="LineNr">949 </span><span class="Normal">case</span> <span class="Constant">0x5d</span>:
+<span id="L950" class="LineNr">950 </span><span class="Normal">case</span> <span class="Constant">0x5e</span>:
+<span id="L951" class="LineNr">951 </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="L952" class="LineNr">952 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L23'>reg</a> = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L953" class="LineNr">953 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L73'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L954" class="LineNr">954 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;pop from &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
+<span id="L955" class="LineNr">955 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u = <a href='013direct_addressing.cc.html#L960'>pop</a><span class="Delimiter">();</span>
+<span id="L956" class="LineNr">956 </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="L957" class="LineNr">957 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L958" class="LineNr">958 </span><span class="Delimiter">}</span>
+<span id="L959" class="LineNr">959 </span><span class="Delimiter">:(code)</span>
+<span id="L960" class="LineNr">960 </span><span class="Normal">uint32_t</span> <a href='013direct_addressing.cc.html#L960'>pop</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L961" class="LineNr">961 </span>  <span class="Normal">const</span> <span class="Normal">uint32_t</span> result = <a href='010---vm.cc.html#L209'>read_mem_u32</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L962" class="LineNr">962 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L440'>HEXWORD</a> &lt;&lt; result &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L963" class="LineNr">963 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u += <span class="Constant">4</span><span class="Delimiter">;</span>
+<span id="L964" class="LineNr">964 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L440'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L965" class="LineNr">965 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L966" class="LineNr">966 </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 2919e67e..f6a7c6e1 100644
--- a/html/subx/014indirect_addressing.cc.html
+++ b/html/subx/014indirect_addressing.cc.html
@@ -14,18 +14,14 @@ pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-
 body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
-.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
-.traceContains { color: #005f00; }
 .LineNr { }
-.traceAbsent { color: #c00000; }
 .Constant { color: #008787; }
-.SalientComment { color: #0000af; }
 .Delimiter { color: #c000c0; }
 .Special { color: #d70000; }
 .Identifier { color: #af5f00; }
 .Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 .Comment { color: #005faf; }
-.PreProc { color: #c000c0; }
+.SalientComment { color: #0000af; }
 -->
 </style>
 
@@ -64,605 +60,768 @@ if ('onhashchange' in window) {
 <span id="L1" class="LineNr">  1 </span><span class="Comment">//: operating on memory at the address provided by some register</span>
 <span id="L2" class="LineNr">  2 </span><span class="Comment">//: we'll now start providing data in a separate segment</span>
 <span id="L3" class="LineNr">  3 </span>
-<span id="L4" class="LineNr">  4 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32)</span>
-<span id="L5" class="LineNr">  5 </span><span class="Special">% Reg[EBX].i = 0x10;</span>
-<span id="L6" class="LineNr">  6 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
-<span id="L7" class="LineNr">  7 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L8" class="LineNr">  8 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L9" class="LineNr">  9 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  <span class="Constant">18</span>                                     <span class="Comment"># add EBX to *EAX</span>
-<span id="L10" class="LineNr"> 10 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L11" class="LineNr"> 11 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L12" class="LineNr"> 12 </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="L13" class="LineNr"> 13 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L14" class="LineNr"> 14 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span>
-<span id="L15" class="LineNr"> 15 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L16" class="LineNr"> 16 </span>
-<span id="L17" class="LineNr"> 17 </span><span class="Delimiter">:(before &quot;End Mod Special-cases(addr)&quot;)</span>
-<span id="L18" class="LineNr"> 18 </span><span class="Normal">case</span> <span class="Constant">0</span>:  <span class="Comment">// indirect addressing</span>
-<span id="L19" class="LineNr"> 19 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L20" class="LineNr"> 20 </span>  <span class="Normal">default</span>:  <span class="Comment">// address in register</span>
-<span id="L21" class="LineNr"> 21 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rm]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L63'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L22" class="LineNr"> 22 </span>    addr = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L23" class="LineNr"> 23 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L24" class="LineNr"> 24 </span>  <span class="Comment">// End Mod 0 Special-cases(addr)</span>
-<span id="L25" class="LineNr"> 25 </span>  <span class="Delimiter">}</span>
-<span id="L26" class="LineNr"> 26 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L27" class="LineNr"> 27 </span>
-<span id="L28" class="LineNr"> 28 </span><span class="Comment">//:</span>
-<span id="L29" class="LineNr"> 29 </span>
-<span id="L30" class="LineNr"> 30 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L31" class="LineNr"> 31 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;03&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add rm32 to r32 (add)&quot;</span><span class="Delimiter">);</span>
+<span id="L4" class="LineNr">  4 </span><span class="Normal">void</span> <a href='014indirect_addressing.cc.html#L4'>test_add_r32_to_mem_at_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L5" class="LineNr">  5 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x10</span><span class="Delimiter">;</span>
+<span id="L6" class="LineNr">  6 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L7" class="LineNr">  7 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L8" class="LineNr">  8 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<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">&quot;  01  18                                       \n&quot;</span>  <span class="Comment">// add EBX to *EAX</span>
+<span id="L11" class="LineNr"> 11 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
+<span id="L12" class="LineNr"> 12 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L13" class="LineNr"> 13 </span>      <span class="Constant">&quot;01 00 00 00\n&quot;</span>  <span class="Comment">// 0x00000001</span>
+<span id="L14" class="LineNr"> 14 </span>  <span class="Delimiter">);</span>
+<span id="L15" class="LineNr"> 15 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L16" class="LineNr"> 16 </span>      <span class="Constant">&quot;run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32\n&quot;</span>
+<span id="L17" class="LineNr"> 17 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EAX)\n&quot;</span>
+<span id="L18" class="LineNr"> 18 </span>      <span class="Constant">&quot;run: storing 0x00000011\n&quot;</span>
+<span id="L19" class="LineNr"> 19 </span>  <span class="Delimiter">);</span>
+<span id="L20" class="LineNr"> 20 </span><span class="Delimiter">}</span>
+<span id="L21" class="LineNr"> 21 </span>
+<span id="L22" class="LineNr"> 22 </span><span class="Delimiter">:(before &quot;End Mod Special-cases(addr)&quot;)</span>
+<span id="L23" class="LineNr"> 23 </span><span class="Normal">case</span> <span class="Constant">0</span>:  <span class="Comment">// indirect addressing</span>
+<span id="L24" class="LineNr"> 24 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L25" class="LineNr"> 25 </span>  <span class="Normal">default</span>:  <span class="Comment">// address in register</span>
+<span id="L26" class="LineNr"> 26 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rm]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L73'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L27" class="LineNr"> 27 </span>    addr = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rm]<span class="Delimiter">.</span>u<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 Mod 0 Special-cases(addr)</span>
+<span id="L30" class="LineNr"> 30 </span>  <span class="Delimiter">}</span>
+<span id="L31" class="LineNr"> 31 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L32" class="LineNr"> 32 </span>
-<span id="L33" class="LineNr"> 33 </span><span class="Delimiter">:(scenario add_mem_at_r32_to_r32)</span>
-<span id="L34" class="LineNr"> 34 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
-<span id="L35" class="LineNr"> 35 </span><span class="Special">% Reg[EBX].i = 0x10;</span>
-<span id="L36" class="LineNr"> 36 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L37" class="LineNr"> 37 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L38" class="LineNr"> 38 </span>  <span class="PreProc">0</span><span class="Constant">3</span>  <span class="Constant">18</span>                                      <span class="Comment"># add *EAX to EBX</span>
-<span id="L39" class="LineNr"> 39 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L40" class="LineNr"> 40 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L41" class="LineNr"> 41 </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="L42" class="LineNr"> 42 </span><span class="traceContains">+run: add r/m32 to <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L43" class="LineNr"> 43 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span>
-<span id="L44" class="LineNr"> 44 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L45" class="LineNr"> 45 </span>
-<span id="L46" class="LineNr"> 46 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L47" class="LineNr"> 47 </span><span class="Normal">case</span> <span class="Constant">0x03</span>: <span class="Delimiter">{</span>  <span class="Comment">// add r/m32 to r32</span>
-<span id="L48" class="LineNr"> 48 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L49" class="LineNr"> 49 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg1 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L50" class="LineNr"> 50 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add r/m32 to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L63'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L51" class="LineNr"> 51 </span>  <span class="Normal">const</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="L52" class="LineNr"> 52 </span>  <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg1]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
-<span id="L53" class="LineNr"> 53 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L54" class="LineNr"> 54 </span><span class="Delimiter">}</span>
-<span id="L55" class="LineNr"> 55 </span>
-<span id="L56" class="LineNr"> 56 </span><span class="SalientComment">//:: subtract</span>
-<span id="L57" class="LineNr"> 57 </span>
-<span id="L58" class="LineNr"> 58 </span><span class="Delimiter">:(scenario subtract_r32_from_mem_at_r32)</span>
-<span id="L59" class="LineNr"> 59 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
-<span id="L60" class="LineNr"> 60 </span><span class="Special">% Reg[EBX].i = 1;</span>
-<span id="L61" class="LineNr"> 61 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L62" class="LineNr"> 62 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L63" class="LineNr"> 63 </span>  <span class="Constant">29</span>  <span class="Constant">18</span>                                      <span class="Comment"># subtract EBX from *EAX</span>
-<span id="L64" class="LineNr"> 64 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L65" class="LineNr"> 65 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L66" class="LineNr"> 66 </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="L67" class="LineNr"> 67 </span><span class="traceContains">+run: subtract <a href='010---vm.cc.html#L16'>EBX</a> from r/m32</span>
-<span id="L68" class="LineNr"> 68 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span>
-<span id="L69" class="LineNr"> 69 </span><span class="traceContains">+run: storing 0x00000009</span>
-<span id="L70" class="LineNr"> 70 </span>
-<span id="L71" class="LineNr"> 71 </span><span class="Comment">//:</span>
-<span id="L72" class="LineNr"> 72 </span>
-<span id="L73" class="LineNr"> 73 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L74" class="LineNr"> 74 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;2b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract rm32 from r32 (sub)&quot;</span><span class="Delimiter">);</span>
-<span id="L75" class="LineNr"> 75 </span>
-<span id="L76" class="LineNr"> 76 </span><span class="Delimiter">:(scenario subtract_mem_at_r32_from_r32)</span>
-<span id="L77" class="LineNr"> 77 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
-<span id="L78" class="LineNr"> 78 </span><span class="Special">% Reg[EBX].i = 10;</span>
-<span id="L79" class="LineNr"> 79 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L80" class="LineNr"> 80 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L81" class="LineNr"> 81 </span>  2b  <span class="Constant">18</span>                                      <span class="Comment"># subtract *EAX from EBX</span>
-<span id="L82" class="LineNr"> 82 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L83" class="LineNr"> 83 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L84" class="LineNr"> 84 </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="L85" class="LineNr"> 85 </span><span class="traceContains">+run: subtract r/m32 from <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L86" class="LineNr"> 86 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span>
-<span id="L87" class="LineNr"> 87 </span><span class="traceContains">+run: storing 0x00000009</span>
-<span id="L88" class="LineNr"> 88 </span>
-<span id="L89" class="LineNr"> 89 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L90" class="LineNr"> 90 </span><span class="Normal">case</span> <span class="Constant">0x2b</span>: <span class="Delimiter">{</span>  <span class="Comment">// subtract r/m32 from r32</span>
-<span id="L91" class="LineNr"> 91 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L92" class="LineNr"> 92 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg1 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L93" class="LineNr"> 93 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract r/m32 from &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L63'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L94" class="LineNr"> 94 </span>  <span class="Normal">const</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="L95" class="LineNr"> 95 </span>  <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg1]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
-<span id="L96" class="LineNr"> 96 </span>  <span class="Identifier">break</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="SalientComment">//:: and</span>
-<span id="L100" class="LineNr">100 </span>
-<span id="L101" class="LineNr">101 </span><span class="Delimiter">:(scenario and_r32_with_mem_at_r32)</span>
-<span id="L102" class="LineNr">102 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
-<span id="L103" class="LineNr">103 </span><span class="Special">% Reg[EBX].i = 0xff;</span>
-<span id="L104" class="LineNr">104 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L105" class="LineNr">105 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L106" class="LineNr">106 </span>  <span class="Constant">21</span>  <span class="Constant">18</span>                                      <span class="Comment"># and EBX with *EAX</span>
-<span id="L107" class="LineNr">107 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L108" class="LineNr">108 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L109" class="LineNr">109 </span>0d 0c 0b 0a  <span class="Comment"># 0x0a0b0c0d</span>
-<span id="L110" class="LineNr">110 </span><span class="traceContains">+run: and <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L111" class="LineNr">111 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span>
-<span id="L112" class="LineNr">112 </span><span class="traceContains">+run: storing 0x0000000d</span>
-<span id="L113" class="LineNr">113 </span>
-<span id="L114" class="LineNr">114 </span><span class="Comment">//:</span>
-<span id="L115" class="LineNr">115 </span>
-<span id="L116" class="LineNr">116 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L117" class="LineNr">117 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;23&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;r32 = bitwise AND of r32 with rm32 (and)&quot;</span><span class="Delimiter">);</span>
-<span id="L118" class="LineNr">118 </span>
-<span id="L119" class="LineNr">119 </span><span class="Delimiter">:(scenario and_mem_at_r32_with_r32)</span>
-<span id="L120" class="LineNr">120 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
-<span id="L121" class="LineNr">121 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
-<span id="L122" class="LineNr">122 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L123" class="LineNr">123 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L124" class="LineNr">124 </span>  <span class="Constant">23</span>  <span class="Constant">18</span>                                      <span class="Comment"># and *EAX with EBX</span>
-<span id="L125" class="LineNr">125 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L126" class="LineNr">126 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L127" class="LineNr">127 </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="L128" class="LineNr">128 </span><span class="traceContains">+run: and r/m32 with <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L129" class="LineNr">129 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span>
-<span id="L130" class="LineNr">130 </span><span class="traceContains">+run: storing 0x0000000d</span>
-<span id="L131" class="LineNr">131 </span>
-<span id="L132" class="LineNr">132 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L133" class="LineNr">133 </span><span class="Normal">case</span> <span class="Constant">0x23</span>: <span class="Delimiter">{</span>  <span class="Comment">// and r/m32 with r32</span>
-<span id="L134" class="LineNr">134 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L135" class="LineNr">135 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg1 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L136" class="LineNr">136 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L63'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L137" class="LineNr">137 </span>  <span class="Normal">const</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="L138" class="LineNr">138 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg1]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
-<span id="L139" class="LineNr">139 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L33" class="LineNr"> 33 </span><span class="Comment">//:</span>
+<span id="L34" class="LineNr"> 34 </span>
+<span id="L35" class="LineNr"> 35 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L36" class="LineNr"> 36 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;03&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add rm32 to r32 (add)&quot;</span><span class="Delimiter">);</span>
+<span id="L37" class="LineNr"> 37 </span>
+<span id="L38" class="LineNr"> 38 </span><span class="Delimiter">:(code)</span>
+<span id="L39" class="LineNr"> 39 </span><span class="Normal">void</span> <a href='014indirect_addressing.cc.html#L39'>test_add_mem_at_r32_to_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L40" class="LineNr"> 40 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L41" class="LineNr"> 41 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x10</span><span class="Delimiter">;</span>
+<span id="L42" class="LineNr"> 42 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L43" class="LineNr"> 43 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L44" class="LineNr"> 44 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L45" class="LineNr"> 45 </span>      <span class="Constant">&quot;  03  18                                       \n&quot;</span>  <span class="Comment">// add *EAX to EBX</span>
+<span id="L46" class="LineNr"> 46 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
+<span id="L47" class="LineNr"> 47 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L48" class="LineNr"> 48 </span>      <span class="Constant">&quot;01 00 00 00\n&quot;</span>  <span class="Comment">// 0x00000001</span>
+<span id="L49" class="LineNr"> 49 </span>  <span class="Delimiter">);</span>
+<span id="L50" class="LineNr"> 50 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L51" class="LineNr"> 51 </span>      <span class="Constant">&quot;run: add r/m32 to EBX\n&quot;</span>
+<span id="L52" class="LineNr"> 52 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EAX)\n&quot;</span>
+<span id="L53" class="LineNr"> 53 </span>      <span class="Constant">&quot;run: storing 0x00000011\n&quot;</span>
+<span id="L54" class="LineNr"> 54 </span>  <span class="Delimiter">);</span>
+<span id="L55" class="LineNr"> 55 </span><span class="Delimiter">}</span>
+<span id="L56" class="LineNr"> 56 </span>
+<span id="L57" class="LineNr"> 57 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L58" class="LineNr"> 58 </span><span class="Normal">case</span> <span class="Constant">0x03</span>: <span class="Delimiter">{</span>  <span class="Comment">// add r/m32 to r32</span>
+<span id="L59" class="LineNr"> 59 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
+<span id="L60" class="LineNr"> 60 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg1 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L61" class="LineNr"> 61 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add r/m32 to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L73'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L62" class="LineNr"> 62 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='013direct_addressing.cc.html#L38'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L63" class="LineNr"> 63 </span>  <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg1]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
+<span id="L64" class="LineNr"> 64 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L65" class="LineNr"> 65 </span><span class="Delimiter">}</span>
+<span id="L66" class="LineNr"> 66 </span>
+<span id="L67" class="LineNr"> 67 </span><span class="SalientComment">//:: subtract</span>
+<span id="L68" class="LineNr"> 68 </span>
+<span id="L69" class="LineNr"> 69 </span><span class="Delimiter">:(code)</span>
+<span id="L70" class="LineNr"> 70 </span><span class="Normal">void</span> <a href='014indirect_addressing.cc.html#L70'>test_subtract_r32_from_mem_at_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L71" class="LineNr"> 71 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L72" class="LineNr"> 72 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L73" class="LineNr"> 73 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L74" class="LineNr"> 74 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L75" class="LineNr"> 75 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L76" class="LineNr"> 76 </span>      <span class="Constant">&quot;  29  18                                       \n&quot;</span>  <span class="Comment">// subtract EBX from *EAX</span>
+<span id="L77" class="LineNr"> 77 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
+<span id="L78" class="LineNr"> 78 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L79" class="LineNr"> 79 </span>      <span class="Constant">&quot;0a 00 00 00\n&quot;</span>  <span class="Comment">// 0x0000000a</span>
+<span id="L80" class="LineNr"> 80 </span>  <span class="Delimiter">);</span>
+<span id="L81" class="LineNr"> 81 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L82" class="LineNr"> 82 </span>      <span class="Constant">&quot;run: subtract <a href='010---vm.cc.html#L16'>EBX</a> from r/m32\n&quot;</span>
+<span id="L83" class="LineNr"> 83 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EAX)\n&quot;</span>
+<span id="L84" class="LineNr"> 84 </span>      <span class="Constant">&quot;run: storing 0x00000009\n&quot;</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="Comment">//:</span>
+<span id="L89" class="LineNr"> 89 </span>
+<span id="L90" class="LineNr"> 90 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L91" class="LineNr"> 91 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;2b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract rm32 from r32 (sub)&quot;</span><span class="Delimiter">);</span>
+<span id="L92" class="LineNr"> 92 </span>
+<span id="L93" class="LineNr"> 93 </span><span class="Delimiter">:(code)</span>
+<span id="L94" class="LineNr"> 94 </span><span class="Normal">void</span> <a href='014indirect_addressing.cc.html#L94'>test_subtract_mem_at_r32_from_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L95" class="LineNr"> 95 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L96" class="LineNr"> 96 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">10</span><span class="Delimiter">;</span>
+<span id="L97" class="LineNr"> 97 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L98" class="LineNr"> 98 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L99" class="LineNr"> 99 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L100" class="LineNr">100 </span>      <span class="Constant">&quot;  2b     18                                    \n&quot;</span>  <span class="Comment">// subtract *EAX from EBX</span>
+<span id="L101" class="LineNr">101 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
+<span id="L102" class="LineNr">102 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L103" class="LineNr">103 </span>      <span class="Constant">&quot;01 00 00 00\n&quot;</span>  <span class="Comment">// 0x00000001</span>
+<span id="L104" class="LineNr">104 </span>  <span class="Delimiter">);</span>
+<span id="L105" class="LineNr">105 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L106" class="LineNr">106 </span>      <span class="Constant">&quot;run: subtract r/m32 from EBX\n&quot;</span>
+<span id="L107" class="LineNr">107 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EAX)\n&quot;</span>
+<span id="L108" class="LineNr">108 </span>      <span class="Constant">&quot;run: storing 0x00000009\n&quot;</span>
+<span id="L109" class="LineNr">109 </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="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L113" class="LineNr">113 </span><span class="Normal">case</span> <span class="Constant">0x2b</span>: <span class="Delimiter">{</span>  <span class="Comment">// subtract r/m32 from r32</span>
+<span id="L114" class="LineNr">114 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
+<span id="L115" class="LineNr">115 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg1 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L116" class="LineNr">116 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract r/m32 from &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L73'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L117" class="LineNr">117 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='013direct_addressing.cc.html#L38'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L118" class="LineNr">118 </span>  <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg1]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
+<span id="L119" class="LineNr">119 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L120" class="LineNr">120 </span><span class="Delimiter">}</span>
+<span id="L121" class="LineNr">121 </span>
+<span id="L122" class="LineNr">122 </span><span class="SalientComment">//:: and</span>
+<span id="L123" class="LineNr">123 </span><span class="Delimiter">:(code)</span>
+<span id="L124" class="LineNr">124 </span><span class="Normal">void</span> <a href='014indirect_addressing.cc.html#L124'>test_and_r32_with_mem_at_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L125" class="LineNr">125 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L126" class="LineNr">126 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0xff</span><span class="Delimiter">;</span>
+<span id="L127" class="LineNr">127 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L128" class="LineNr">128 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L129" class="LineNr">129 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L130" class="LineNr">130 </span>      <span class="Constant">&quot;  21     18                                    \n&quot;</span>  <span class="Comment">// and EBX with *EAX</span>
+<span id="L131" class="LineNr">131 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
+<span id="L132" class="LineNr">132 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L133" class="LineNr">133 </span>      <span class="Constant">&quot;0d 0c 0b 0a\n&quot;</span>  <span class="Comment">// 0x0a0b0c0d</span>
+<span id="L134" class="LineNr">134 </span>  <span class="Delimiter">);</span>
+<span id="L135" class="LineNr">135 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L136" class="LineNr">136 </span>      <span class="Constant">&quot;run: and <a href='010---vm.cc.html#L16'>EBX</a> with r/m32\n&quot;</span>
+<span id="L137" class="LineNr">137 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EAX)\n&quot;</span>
+<span id="L138" class="LineNr">138 </span>      <span class="Constant">&quot;run: storing 0x0000000d\n&quot;</span>
+<span id="L139" class="LineNr">139 </span>  <span class="Delimiter">);</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="SalientComment">//:: or</span>
+<span id="L142" class="LineNr">142 </span><span class="Comment">//:</span>
 <span id="L143" class="LineNr">143 </span>
-<span id="L144" class="LineNr">144 </span><span class="Delimiter">:(scenario or_r32_with_mem_at_r32)</span>
-<span id="L145" class="LineNr">145 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
-<span id="L146" class="LineNr">146 </span><span class="Special">% Reg[EBX].i = 0xa0b0c0d0;</span>
-<span id="L147" class="LineNr">147 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L148" class="LineNr">148 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L149" class="LineNr">149 </span>  <span class="Error">09</span>  <span class="Constant">18</span>                                      <span class="Comment"># or EBX with *EAX</span>
-<span id="L150" class="LineNr">150 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L151" class="LineNr">151 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L152" class="LineNr">152 </span>0d 0c 0b 0a  <span class="Comment"># 0x0a0b0c0d</span>
-<span id="L153" class="LineNr">153 </span><span class="traceContains">+run: or <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L154" class="LineNr">154 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span>
-<span id="L155" class="LineNr">155 </span><span class="traceContains">+run: storing 0xaabbccdd</span>
-<span id="L156" class="LineNr">156 </span>
-<span id="L157" class="LineNr">157 </span><span class="Comment">//:</span>
-<span id="L158" class="LineNr">158 </span>
-<span id="L159" class="LineNr">159 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L160" class="LineNr">160 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;0b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;r32 = bitwise OR of r32 with rm32 (or)&quot;</span><span class="Delimiter">);</span>
-<span id="L161" class="LineNr">161 </span>
-<span id="L162" class="LineNr">162 </span><span class="Delimiter">:(scenario or_mem_at_r32_with_r32)</span>
-<span id="L163" class="LineNr">163 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
-<span id="L164" class="LineNr">164 </span><span class="Special">% Reg[EBX].i = 0xa0b0c0d0;</span>
-<span id="L165" class="LineNr">165 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L166" class="LineNr">166 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L167" class="LineNr">167 </span>  0b  <span class="Constant">18</span>                                      <span class="Comment"># or *EAX with EBX</span>
-<span id="L168" class="LineNr">168 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L169" class="LineNr">169 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L170" class="LineNr">170 </span>0d 0c 0b 0a  <span class="Comment"># 0x0a0b0c0d</span>
-<span id="L171" class="LineNr">171 </span><span class="traceContains">+run: or r/m32 with <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L172" class="LineNr">172 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span>
-<span id="L173" class="LineNr">173 </span><span class="traceContains">+run: storing 0xaabbccdd</span>
-<span id="L174" class="LineNr">174 </span>
-<span id="L175" class="LineNr">175 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L176" class="LineNr">176 </span><span class="Normal">case</span> <span class="Constant">0x0b</span>: <span class="Delimiter">{</span>  <span class="Comment">// or r/m32 with r32</span>
-<span id="L177" class="LineNr">177 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L178" class="LineNr">178 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg1 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L179" class="LineNr">179 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L63'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L180" class="LineNr">180 </span>  <span class="Normal">const</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="L181" class="LineNr">181 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg1]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
-<span id="L182" class="LineNr">182 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L183" class="LineNr">183 </span><span class="Delimiter">}</span>
-<span id="L184" class="LineNr">184 </span>
-<span id="L185" class="LineNr">185 </span><span class="SalientComment">//:: xor</span>
-<span id="L186" class="LineNr">186 </span>
-<span id="L187" class="LineNr">187 </span><span class="Delimiter">:(scenario xor_r32_with_mem_at_r32)</span>
-<span id="L188" class="LineNr">188 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
-<span id="L189" class="LineNr">189 </span><span class="Special">% Reg[EBX].i = 0xa0b0c0d0;</span>
-<span id="L190" class="LineNr">190 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L191" class="LineNr">191 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L192" class="LineNr">192 </span>  <span class="Constant">31</span>  <span class="Constant">18</span>                                      <span class="Comment"># xor EBX with *EAX</span>
-<span id="L193" class="LineNr">193 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L194" class="LineNr">194 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L195" class="LineNr">195 </span>0d 0c bb aa  <span class="Comment"># 0xaabb0c0d</span>
-<span id="L196" class="LineNr">196 </span><span class="traceContains">+run: xor <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L197" class="LineNr">197 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span>
-<span id="L198" class="LineNr">198 </span><span class="traceContains">+run: storing 0x0a0bccdd</span>
-<span id="L199" class="LineNr">199 </span>
-<span id="L200" class="LineNr">200 </span><span class="Comment">//:</span>
+<span id="L144" class="LineNr">144 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L145" class="LineNr">145 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;23&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;r32 = bitwise AND of r32 with rm32 (and)&quot;</span><span class="Delimiter">);</span>
+<span id="L146" class="LineNr">146 </span>
+<span id="L147" class="LineNr">147 </span><span class="Delimiter">:(code)</span>
+<span id="L148" class="LineNr">148 </span><span class="Normal">void</span> <a href='014indirect_addressing.cc.html#L148'>test_and_mem_at_r32_with_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L149" class="LineNr">149 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L150" class="LineNr">150 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x0a0b0c0d</span><span class="Delimiter">;</span>
+<span id="L151" class="LineNr">151 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L152" class="LineNr">152 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L153" class="LineNr">153 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L154" class="LineNr">154 </span>      <span class="Constant">&quot;  23     18                                    \n&quot;</span>  <span class="Comment">// and *EAX with EBX</span>
+<span id="L155" class="LineNr">155 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
+<span id="L156" class="LineNr">156 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L157" class="LineNr">157 </span>      <span class="Constant">&quot;ff 00 00 00\n&quot;</span>  <span class="Comment">// 0x000000ff</span>
+<span id="L158" class="LineNr">158 </span>  <span class="Delimiter">);</span>
+<span id="L159" class="LineNr">159 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L160" class="LineNr">160 </span>      <span class="Constant">&quot;run: and r/m32 with EBX\n&quot;</span>
+<span id="L161" class="LineNr">161 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EAX)\n&quot;</span>
+<span id="L162" class="LineNr">162 </span>      <span class="Constant">&quot;run: storing 0x0000000d\n&quot;</span>
+<span id="L163" class="LineNr">163 </span>  <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="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L167" class="LineNr">167 </span><span class="Normal">case</span> <span class="Constant">0x23</span>: <span class="Delimiter">{</span>  <span class="Comment">// and r/m32 with r32</span>
+<span id="L168" class="LineNr">168 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
+<span id="L169" class="LineNr">169 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg1 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L170" class="LineNr">170 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L73'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L171" class="LineNr">171 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='013direct_addressing.cc.html#L38'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L172" class="LineNr">172 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg1]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
+<span id="L173" class="LineNr">173 </span>  <span class="Identifier">break</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="SalientComment">//:: or</span>
+<span id="L177" class="LineNr">177 </span>
+<span id="L178" class="LineNr">178 </span><span class="Delimiter">:(code)</span>
+<span id="L179" class="LineNr">179 </span><span class="Normal">void</span> <a href='014indirect_addressing.cc.html#L179'>test_or_r32_with_mem_at_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L180" class="LineNr">180 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L181" class="LineNr">181 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0xa0b0c0d0</span><span class="Delimiter">;</span>
+<span id="L182" class="LineNr">182 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L183" class="LineNr">183 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L184" class="LineNr">184 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L185" class="LineNr">185 </span>      <span class="Constant">&quot;  09  18                                      #\n&quot;</span>  <span class="Comment">// EBX with *EAX</span>
+<span id="L186" class="LineNr">186 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
+<span id="L187" class="LineNr">187 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L188" class="LineNr">188 </span>      <span class="Constant">&quot;0d 0c 0b 0a\n&quot;</span>  <span class="Comment">// 0x0a0b0c0d</span>
+<span id="L189" class="LineNr">189 </span>  <span class="Delimiter">);</span>
+<span id="L190" class="LineNr">190 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L191" class="LineNr">191 </span>      <span class="Constant">&quot;run: or <a href='010---vm.cc.html#L16'>EBX</a> with r/m32\n&quot;</span>
+<span id="L192" class="LineNr">192 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EAX)\n&quot;</span>
+<span id="L193" class="LineNr">193 </span>      <span class="Constant">&quot;run: storing 0xaabbccdd\n&quot;</span>
+<span id="L194" class="LineNr">194 </span>  <span class="Delimiter">);</span>
+<span id="L195" class="LineNr">195 </span><span class="Delimiter">}</span>
+<span id="L196" class="LineNr">196 </span>
+<span id="L197" class="LineNr">197 </span><span class="Comment">//:</span>
+<span id="L198" class="LineNr">198 </span>
+<span id="L199" class="LineNr">199 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L200" class="LineNr">200 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;0b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;r32 = bitwise OR of r32 with rm32 (or)&quot;</span><span class="Delimiter">);</span>
 <span id="L201" class="LineNr">201 </span>
-<span id="L202" class="LineNr">202 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L203" class="LineNr">203 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;33&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;r32 = bitwise XOR of r32 with rm32 (xor)&quot;</span><span class="Delimiter">);</span>
-<span id="L204" class="LineNr">204 </span>
-<span id="L205" class="LineNr">205 </span><span class="Delimiter">:(scenario xor_mem_at_r32_with_r32)</span>
-<span id="L206" class="LineNr">206 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
-<span id="L207" class="LineNr">207 </span><span class="Special">% Reg[EBX].i = 0xa0b0c0d0;</span>
-<span id="L208" class="LineNr">208 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L209" class="LineNr">209 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L210" class="LineNr">210 </span>  <span class="Constant">33</span>  <span class="Constant">18</span>                                      <span class="Comment"># xor *EAX with EBX</span>
-<span id="L211" class="LineNr">211 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L212" class="LineNr">212 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L213" class="LineNr">213 </span>0d 0c 0b 0a  <span class="Comment"># 0x0a0b0c0d</span>
-<span id="L214" class="LineNr">214 </span><span class="traceContains">+run: xor r/m32 with <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L215" class="LineNr">215 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span>
-<span id="L216" class="LineNr">216 </span><span class="traceContains">+run: storing 0xaabbccdd</span>
-<span id="L217" class="LineNr">217 </span>
-<span id="L218" class="LineNr">218 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L219" class="LineNr">219 </span><span class="Normal">case</span> <span class="Constant">0x33</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor r/m32 with r32</span>
-<span id="L220" class="LineNr">220 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L221" class="LineNr">221 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg1 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L222" class="LineNr">222 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L63'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L223" class="LineNr">223 </span>  <span class="Normal">const</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="L224" class="LineNr">224 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg1]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
-<span id="L225" class="LineNr">225 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L226" class="LineNr">226 </span><span class="Delimiter">}</span>
-<span id="L227" class="LineNr">227 </span>
-<span id="L228" class="LineNr">228 </span><span class="SalientComment">//:: not</span>
-<span id="L229" class="LineNr">229 </span>
-<span id="L230" class="LineNr">230 </span><span class="Delimiter">:(scenario not_of_mem_at_r32)</span>
-<span id="L231" class="LineNr">231 </span><span class="Special">% Reg[EBX].i = 0x2000;</span>
-<span id="L232" class="LineNr">232 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L233" class="LineNr">233 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L234" class="LineNr">234 </span>  f7  <span class="Constant">13</span>                                      <span class="Comment"># not *EBX</span>
-<span id="L235" class="LineNr">235 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 010 (subop not) 011 (dest EBX)</span>
-<span id="L236" class="LineNr">236 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L237" class="LineNr">237 </span>ff <span class="PreProc">0</span><span class="Constant">0</span> <span class="Constant">0f</span> <span class="Constant">0f</span>  <span class="Comment"># 0x0f0f00ff</span>
-<span id="L238" class="LineNr">238 </span><span class="traceContains">+run: operate on r/m32</span>
-<span id="L239" class="LineNr">239 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
-<span id="L240" class="LineNr">240 </span><span class="traceContains">+run: subop: not</span>
-<span id="L241" class="LineNr">241 </span><span class="traceContains">+run: storing 0xf0f0ff00</span>
-<span id="L242" class="LineNr">242 </span>
-<span id="L243" class="LineNr">243 </span><span class="SalientComment">//:: compare (cmp)</span>
-<span id="L244" class="LineNr">244 </span>
-<span id="L245" class="LineNr">245 </span><span class="Delimiter">:(scenario compare_mem_at_r32_with_r32_greater)</span>
-<span id="L246" class="LineNr">246 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
-<span id="L247" class="LineNr">247 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c07;</span>
-<span id="L248" class="LineNr">248 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L249" class="LineNr">249 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L250" class="LineNr">250 </span>  <span class="Constant">39</span>  <span class="Constant">18</span>                                      <span class="Comment"># compare EBX with *EAX</span>
-<span id="L251" class="LineNr">251 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L252" class="LineNr">252 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L253" class="LineNr">253 </span>0d 0c 0b 0a  <span class="Comment"># 0x0a0b0c0d</span>
-<span id="L254" class="LineNr">254 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L255" class="LineNr">255 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span>
-<span id="L256" class="LineNr">256 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
-<span id="L257" class="LineNr">257 </span>
-<span id="L258" class="LineNr">258 </span><span class="Delimiter">:(scenario compare_mem_at_r32_with_r32_lesser)</span>
-<span id="L259" class="LineNr">259 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
-<span id="L260" class="LineNr">260 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
-<span id="L261" class="LineNr">261 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L262" class="LineNr">262 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L263" class="LineNr">263 </span>  <span class="Constant">39</span>  <span class="Constant">18</span>                                      <span class="Comment"># compare EBX with *EAX</span>
-<span id="L264" class="LineNr">264 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L265" class="LineNr">265 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L266" class="LineNr">266 </span><span class="PreProc">0</span><span class="Constant">7</span> 0c 0b 0a  <span class="Comment"># 0x0a0b0c0d</span>
-<span id="L267" class="LineNr">267 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L268" class="LineNr">268 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span>
-<span id="L269" class="LineNr">269 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
-<span id="L270" class="LineNr">270 </span>
-<span id="L271" class="LineNr">271 </span><span class="Delimiter">:(scenario compare_mem_at_r32_with_r32_equal)</span>
-<span id="L272" class="LineNr">272 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
-<span id="L273" class="LineNr">273 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
-<span id="L274" class="LineNr">274 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L275" class="LineNr">275 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L276" class="LineNr">276 </span>  <span class="Constant">39</span>  <span class="Constant">18</span>                                      <span class="Comment"># compare EBX with *EAX</span>
-<span id="L277" class="LineNr">277 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L278" class="LineNr">278 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L279" class="LineNr">279 </span>0d 0c 0b 0a  <span class="Comment"># 0x0a0b0c0d</span>
-<span id="L280" class="LineNr">280 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L281" class="LineNr">281 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span>
-<span id="L282" class="LineNr">282 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
-<span id="L283" class="LineNr">283 </span>
-<span id="L284" class="LineNr">284 </span><span class="Comment">//:</span>
-<span id="L285" class="LineNr">285 </span>
-<span id="L286" class="LineNr">286 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L287" class="LineNr">287 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;3b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;compare: set SF if r32 &lt; rm32 (cmp)&quot;</span><span class="Delimiter">);</span>
-<span id="L288" class="LineNr">288 </span>
-<span id="L289" class="LineNr">289 </span><span class="Delimiter">:(scenario compare_r32_with_mem_at_r32_greater)</span>
-<span id="L290" class="LineNr">290 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
-<span id="L291" class="LineNr">291 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
-<span id="L292" class="LineNr">292 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L293" class="LineNr">293 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L294" class="LineNr">294 </span>  3b  <span class="Constant">18</span>                                      <span class="Comment"># compare *EAX with EBX</span>
-<span id="L295" class="LineNr">295 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L296" class="LineNr">296 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L297" class="LineNr">297 </span><span class="PreProc">0</span><span class="Constant">7</span> 0c 0b 0a  <span class="Comment"># 0x0a0b0c0d</span>
-<span id="L298" class="LineNr">298 </span><span class="traceContains">+run: compare r/m32 with <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L299" class="LineNr">299 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span>
-<span id="L300" class="LineNr">300 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
-<span id="L301" class="LineNr">301 </span>
-<span id="L302" class="LineNr">302 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L303" class="LineNr">303 </span><span class="Normal">case</span> <span class="Constant">0x3b</span>: <span class="Delimiter">{</span>  <span class="Comment">// set SF if r32 &lt; r/m32</span>
-<span id="L304" class="LineNr">304 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L305" class="LineNr">305 </span>  <span class="Normal">const</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="L306" class="LineNr">306 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L63'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L307" class="LineNr">307 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg1 = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg1]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L308" class="LineNr">308 </span>  <span class="Normal">const</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="L309" class="LineNr">309 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp1 = arg1 - *arg2<span class="Delimiter">;</span>
-<span id="L310" class="LineNr">310 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L311" class="LineNr">311 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L312" class="LineNr">312 </span>  <span class="Normal">int64_t</span> tmp2 = arg1 - *arg2<span class="Delimiter">;</span>
-<span id="L313" class="LineNr">313 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L314" class="LineNr">314 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L81'>OF</a> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L315" class="LineNr">315 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L316" class="LineNr">316 </span><span class="Delimiter">}</span>
-<span id="L317" class="LineNr">317 </span>
-<span id="L318" class="LineNr">318 </span><span class="Delimiter">:(scenario compare_r32_with_mem_at_r32_lesser)</span>
-<span id="L319" class="LineNr">319 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
-<span id="L320" class="LineNr">320 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c07;</span>
-<span id="L321" class="LineNr">321 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L322" class="LineNr">322 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L323" class="LineNr">323 </span>  3b  <span class="Constant">18</span>                                      <span class="Comment"># compare *EAX with EBX</span>
-<span id="L324" class="LineNr">324 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L325" class="LineNr">325 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L326" class="LineNr">326 </span>0d 0c 0b 0a  <span class="Comment"># 0x0a0b0c0d</span>
-<span id="L327" class="LineNr">327 </span><span class="traceContains">+run: compare r/m32 with <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L328" class="LineNr">328 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span>
-<span id="L329" class="LineNr">329 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
-<span id="L330" class="LineNr">330 </span>
-<span id="L331" class="LineNr">331 </span><span class="Delimiter">:(scenario compare_r32_with_mem_at_r32_equal)</span>
-<span id="L332" class="LineNr">332 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
-<span id="L333" class="LineNr">333 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
-<span id="L334" class="LineNr">334 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L335" class="LineNr">335 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L336" class="LineNr">336 </span>  3b  <span class="Constant">18</span>                                      <span class="Comment"># compare *EAX with EBX</span>
-<span id="L337" class="LineNr">337 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L338" class="LineNr">338 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L339" class="LineNr">339 </span>0d 0c 0b 0a  <span class="Comment"># 0x0a0b0c0d</span>
-<span id="L340" class="LineNr">340 </span><span class="traceContains">+run: compare r/m32 with <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L341" class="LineNr">341 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span>
-<span id="L342" class="LineNr">342 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
-<span id="L343" class="LineNr">343 </span>
-<span id="L344" class="LineNr">344 </span><span class="SalientComment">//:: copy (mov)</span>
+<span id="L202" class="LineNr">202 </span><span class="Delimiter">:(code)</span>
+<span id="L203" class="LineNr">203 </span><span class="Normal">void</span> <a href='014indirect_addressing.cc.html#L203'>test_or_mem_at_r32_with_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L204" class="LineNr">204 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L205" class="LineNr">205 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0xa0b0c0d0</span><span class="Delimiter">;</span>
+<span id="L206" class="LineNr">206 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L207" class="LineNr">207 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L208" class="LineNr">208 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L209" class="LineNr">209 </span>      <span class="Constant">&quot;  0b     18                                    \n&quot;</span>  <span class="Comment">// or *EAX with EBX</span>
+<span id="L210" class="LineNr">210 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
+<span id="L211" class="LineNr">211 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L212" class="LineNr">212 </span>      <span class="Constant">&quot;0d 0c 0b 0a\n&quot;</span>  <span class="Comment">// 0x0a0b0c0d</span>
+<span id="L213" class="LineNr">213 </span>  <span class="Delimiter">);</span>
+<span id="L214" class="LineNr">214 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L215" class="LineNr">215 </span>      <span class="Constant">&quot;run: or r/m32 with EBX\n&quot;</span>
+<span id="L216" class="LineNr">216 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EAX)\n&quot;</span>
+<span id="L217" class="LineNr">217 </span>      <span class="Constant">&quot;run: storing 0xaabbccdd\n&quot;</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 id="L221" class="LineNr">221 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L222" class="LineNr">222 </span><span class="Normal">case</span> <span class="Constant">0x0b</span>: <span class="Delimiter">{</span>  <span class="Comment">// or r/m32 with r32</span>
+<span id="L223" class="LineNr">223 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
+<span id="L224" class="LineNr">224 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg1 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L225" class="LineNr">225 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L73'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L226" class="LineNr">226 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='013direct_addressing.cc.html#L38'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L227" class="LineNr">227 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg1]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
+<span id="L228" class="LineNr">228 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L229" class="LineNr">229 </span><span class="Delimiter">}</span>
+<span id="L230" class="LineNr">230 </span>
+<span id="L231" class="LineNr">231 </span><span class="SalientComment">//:: xor</span>
+<span id="L232" class="LineNr">232 </span>
+<span id="L233" class="LineNr">233 </span><span class="Delimiter">:(code)</span>
+<span id="L234" class="LineNr">234 </span><span class="Normal">void</span> <a href='014indirect_addressing.cc.html#L234'>test_xor_r32_with_mem_at_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L235" class="LineNr">235 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L236" class="LineNr">236 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0xa0b0c0d0</span><span class="Delimiter">;</span>
+<span id="L237" class="LineNr">237 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L238" class="LineNr">238 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L239" class="LineNr">239 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L240" class="LineNr">240 </span>      <span class="Constant">&quot;  31     18                                    \n&quot;</span>  <span class="Comment">// xor EBX with *EAX</span>
+<span id="L241" class="LineNr">241 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L242" class="LineNr">242 </span>      <span class="Constant">&quot;0d 0c bb aa\n&quot;</span>  <span class="Comment">// 0xaabb0c0d</span>
+<span id="L243" class="LineNr">243 </span>  <span class="Delimiter">);</span>
+<span id="L244" class="LineNr">244 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L245" class="LineNr">245 </span>      <span class="Constant">&quot;run: xor <a href='010---vm.cc.html#L16'>EBX</a> with r/m32\n&quot;</span>
+<span id="L246" class="LineNr">246 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EAX)\n&quot;</span>
+<span id="L247" class="LineNr">247 </span>      <span class="Constant">&quot;run: storing 0x0a0bccdd\n&quot;</span>
+<span id="L248" class="LineNr">248 </span>  <span class="Delimiter">);</span>
+<span id="L249" class="LineNr">249 </span><span class="Delimiter">}</span>
+<span id="L250" class="LineNr">250 </span>
+<span id="L251" class="LineNr">251 </span><span class="Comment">//:</span>
+<span id="L252" class="LineNr">252 </span>
+<span id="L253" class="LineNr">253 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L254" class="LineNr">254 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;33&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;r32 = bitwise XOR of r32 with rm32 (xor)&quot;</span><span class="Delimiter">);</span>
+<span id="L255" class="LineNr">255 </span>
+<span id="L256" class="LineNr">256 </span><span class="Delimiter">:(code)</span>
+<span id="L257" class="LineNr">257 </span><span class="Normal">void</span> <a href='014indirect_addressing.cc.html#L257'>test_xor_mem_at_r32_with_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L258" class="LineNr">258 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L259" class="LineNr">259 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0xa0b0c0d0</span><span class="Delimiter">;</span>
+<span id="L260" class="LineNr">260 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L261" class="LineNr">261 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L262" class="LineNr">262 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L263" class="LineNr">263 </span>      <span class="Constant">&quot;  33     18                                    \n&quot;</span>  <span class="Comment">// xor *EAX with EBX</span>
+<span id="L264" class="LineNr">264 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
+<span id="L265" class="LineNr">265 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L266" class="LineNr">266 </span>      <span class="Constant">&quot;0d 0c 0b 0a\n&quot;</span>  <span class="Comment">// 0x0a0b0c0d</span>
+<span id="L267" class="LineNr">267 </span>  <span class="Delimiter">);</span>
+<span id="L268" class="LineNr">268 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L269" class="LineNr">269 </span>      <span class="Constant">&quot;run: xor r/m32 with EBX\n&quot;</span>
+<span id="L270" class="LineNr">270 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EAX)\n&quot;</span>
+<span id="L271" class="LineNr">271 </span>      <span class="Constant">&quot;run: storing 0xaabbccdd\n&quot;</span>
+<span id="L272" class="LineNr">272 </span>  <span class="Delimiter">);</span>
+<span id="L273" class="LineNr">273 </span><span class="Delimiter">}</span>
+<span id="L274" class="LineNr">274 </span>
+<span id="L275" class="LineNr">275 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L276" class="LineNr">276 </span><span class="Normal">case</span> <span class="Constant">0x33</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor r/m32 with r32</span>
+<span id="L277" class="LineNr">277 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
+<span id="L278" class="LineNr">278 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg1 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L279" class="LineNr">279 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L73'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L280" class="LineNr">280 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='013direct_addressing.cc.html#L38'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L281" class="LineNr">281 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg1]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
+<span id="L282" class="LineNr">282 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L283" class="LineNr">283 </span><span class="Delimiter">}</span>
+<span id="L284" class="LineNr">284 </span>
+<span id="L285" class="LineNr">285 </span><span class="SalientComment">//:: not</span>
+<span id="L286" class="LineNr">286 </span>
+<span id="L287" class="LineNr">287 </span><span class="Delimiter">:(code)</span>
+<span id="L288" class="LineNr">288 </span><span class="Normal">void</span> <a href='014indirect_addressing.cc.html#L288'>test_not_of_mem_at_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L289" class="LineNr">289 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L290" class="LineNr">290 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L291" class="LineNr">291 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L292" class="LineNr">292 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L293" class="LineNr">293 </span>      <span class="Constant">&quot;  f7     13                                    \n&quot;</span>  <span class="Comment">// not *EBX</span>
+<span id="L294" class="LineNr">294 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 010 (subop not) 011 (dest EBX)</span>
+<span id="L295" class="LineNr">295 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L296" class="LineNr">296 </span>      <span class="Constant">&quot;ff 00 0f 0f\n&quot;</span>  <span class="Comment">// 0x0f0f00ff</span>
+<span id="L297" class="LineNr">297 </span>  <span class="Delimiter">);</span>
+<span id="L298" class="LineNr">298 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L299" class="LineNr">299 </span>      <span class="Constant">&quot;run: operate on r/m32\n&quot;</span>
+<span id="L300" class="LineNr">300 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EBX)\n&quot;</span>
+<span id="L301" class="LineNr">301 </span>      <span class="Constant">&quot;run: subop: not\n&quot;</span>
+<span id="L302" class="LineNr">302 </span>      <span class="Constant">&quot;run: storing 0xf0f0ff00\n&quot;</span>
+<span id="L303" class="LineNr">303 </span>  <span class="Delimiter">);</span>
+<span id="L304" class="LineNr">304 </span><span class="Delimiter">}</span>
+<span id="L305" class="LineNr">305 </span>
+<span id="L306" class="LineNr">306 </span><span class="SalientComment">//:: compare (cmp)</span>
+<span id="L307" class="LineNr">307 </span>
+<span id="L308" class="LineNr">308 </span><span class="Delimiter">:(code)</span>
+<span id="L309" class="LineNr">309 </span><span class="Normal">void</span> <a href='014indirect_addressing.cc.html#L309'>test_compare_mem_at_r32_with_r32_greater</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L310" class="LineNr">310 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L311" class="LineNr">311 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x0a0b0c07</span><span class="Delimiter">;</span>
+<span id="L312" class="LineNr">312 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L313" class="LineNr">313 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L314" class="LineNr">314 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L315" class="LineNr">315 </span>      <span class="Constant">&quot;  39     18                                    \n&quot;</span>  <span class="Comment">// compare EBX with *EAX</span>
+<span id="L316" class="LineNr">316 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
+<span id="L317" class="LineNr">317 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L318" class="LineNr">318 </span>      <span class="Constant">&quot;0d 0c 0b 0a\n&quot;</span>  <span class="Comment">// 0x0a0b0c0d</span>
+<span id="L319" class="LineNr">319 </span>  <span class="Delimiter">);</span>
+<span id="L320" class="LineNr">320 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L321" class="LineNr">321 </span>      <span class="Constant">&quot;run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32\n&quot;</span>
+<span id="L322" class="LineNr">322 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EAX)\n&quot;</span>
+<span id="L323" class="LineNr">323 </span>      <span class="Constant">&quot;run: SF=0; ZF=0; OF=0\n&quot;</span>
+<span id="L324" class="LineNr">324 </span>  <span class="Delimiter">);</span>
+<span id="L325" class="LineNr">325 </span><span class="Delimiter">}</span>
+<span id="L326" class="LineNr">326 </span>
+<span id="L327" class="LineNr">327 </span><span class="Delimiter">:(code)</span>
+<span id="L328" class="LineNr">328 </span><span class="Normal">void</span> <a href='014indirect_addressing.cc.html#L328'>test_compare_mem_at_r32_with_r32_lesser</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L329" class="LineNr">329 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L330" class="LineNr">330 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x0a0b0c0d</span><span class="Delimiter">;</span>
+<span id="L331" class="LineNr">331 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L332" class="LineNr">332 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L333" class="LineNr">333 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L334" class="LineNr">334 </span>      <span class="Constant">&quot;  39     18                                    \n&quot;</span>  <span class="Comment">// compare EBX with *EAX</span>
+<span id="L335" class="LineNr">335 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
+<span id="L336" class="LineNr">336 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L337" class="LineNr">337 </span>      <span class="Constant">&quot;07 0c 0b 0a\n&quot;</span>  <span class="Comment">// 0x0a0b0c0d</span>
+<span id="L338" class="LineNr">338 </span>  <span class="Delimiter">);</span>
+<span id="L339" class="LineNr">339 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L340" class="LineNr">340 </span>      <span class="Constant">&quot;run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32\n&quot;</span>
+<span id="L341" class="LineNr">341 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EAX)\n&quot;</span>
+<span id="L342" class="LineNr">342 </span>      <span class="Constant">&quot;run: SF=1; ZF=0; OF=0\n&quot;</span>
+<span id="L343" class="LineNr">343 </span>  <span class="Delimiter">);</span>
+<span id="L344" class="LineNr">344 </span><span class="Delimiter">}</span>
 <span id="L345" class="LineNr">345 </span>
-<span id="L346" class="LineNr">346 </span><span class="Delimiter">:(scenario copy_r32_to_mem_at_r32)</span>
-<span id="L347" class="LineNr">347 </span><span class="Special">% Reg[EBX].i = 0xaf;</span>
-<span id="L348" class="LineNr">348 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
-<span id="L349" class="LineNr">349 </span>== <span class="Constant">0x1</span>
-<span id="L350" class="LineNr">350 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L351" class="LineNr">351 </span>  <span class="Constant">89</span>  <span class="Constant">18</span>                                      <span class="Comment"># copy EBX to *EAX</span>
-<span id="L352" class="LineNr">352 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L353" class="LineNr">353 </span><span class="traceContains">+run: copy <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L354" class="LineNr">354 </span><span class="traceContains">+run: effective address is 0x00000060 (EAX)</span>
-<span id="L355" class="LineNr">355 </span><span class="traceContains">+run: storing 0x000000af</span>
-<span id="L356" class="LineNr">356 </span>
-<span id="L357" class="LineNr">357 </span><span class="Comment">//:</span>
-<span id="L358" class="LineNr">358 </span>
-<span id="L359" class="LineNr">359 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L360" class="LineNr">360 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy rm32 to r32 (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L361" class="LineNr">361 </span>
-<span id="L362" class="LineNr">362 </span><span class="Delimiter">:(scenario copy_mem_at_r32_to_r32)</span>
-<span id="L363" class="LineNr">363 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
-<span id="L364" class="LineNr">364 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L365" class="LineNr">365 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L366" class="LineNr">366 </span>  8b  <span class="Constant">18</span>                                      <span class="Comment"># copy *EAX to EBX</span>
-<span id="L367" class="LineNr">367 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L368" class="LineNr">368 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L369" class="LineNr">369 </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="L370" class="LineNr">370 </span><span class="traceContains">+run: copy r/m32 to <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L371" class="LineNr">371 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span>
-<span id="L372" class="LineNr">372 </span><span class="traceContains">+run: storing 0x000000af</span>
-<span id="L373" class="LineNr">373 </span>
-<span id="L374" class="LineNr">374 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L375" class="LineNr">375 </span><span class="Normal">case</span> <span class="Constant">0x8b</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy r32 to r/m32</span>
-<span id="L376" class="LineNr">376 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L377" class="LineNr">377 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> rdest = <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="L378" class="LineNr">378 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy r/m32 to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L63'>rname</a><span class="Delimiter">(</span>rdest<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L379" class="LineNr">379 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* src = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L380" class="LineNr">380 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rdest]<span class="Delimiter">.</span>i = *src<span class="Delimiter">;</span>
-<span id="L381" class="LineNr">381 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L433'>HEXWORD</a> &lt;&lt; *src &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L382" class="LineNr">382 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L383" class="LineNr">383 </span><span class="Delimiter">}</span>
-<span id="L384" class="LineNr">384 </span>
-<span id="L385" class="LineNr">385 </span><span class="SalientComment">//:: jump</span>
-<span id="L386" class="LineNr">386 </span>
-<span id="L387" class="LineNr">387 </span><span class="Delimiter">:(scenario jump_mem_at_r32)</span>
-<span id="L388" class="LineNr">388 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
-<span id="L389" class="LineNr">389 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L390" class="LineNr">390 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L391" class="LineNr">391 </span>  ff  <span class="Constant">20</span>                                      <span class="Comment"># jump to *EAX</span>
-<span id="L392" class="LineNr">392 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 100 (jump to r/m32) 000 (src EAX)</span>
-<span id="L393" class="LineNr">393 </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="L394" class="LineNr">394 </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="L395" class="LineNr">395 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L396" class="LineNr">396 </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="L397" class="LineNr">397 </span><span class="traceContains">+run: 0x00000001 opcode: ff</span>
-<span id="L398" class="LineNr">398 </span><span class="traceContains">+run: jump to r/m32</span>
-<span id="L399" class="LineNr">399 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span>
-<span id="L400" class="LineNr">400 </span><span class="traceContains">+run: jumping to 0x00000008</span>
-<span id="L401" class="LineNr">401 </span><span class="traceContains">+run: 0x00000008 opcode: 05</span>
-<span id="L402" class="LineNr">402 </span><span class="traceAbsent">-run: 0x00000003 opcode: 05</span>
-<span id="L403" class="LineNr">403 </span>
-<span id="L404" class="LineNr">404 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
-<span id="L405" class="LineNr">405 </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="L406" class="LineNr">406 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; end<span class="Delimiter">();</span>
-<span id="L407" class="LineNr">407 </span>  <span class="Normal">const</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="L408" class="LineNr">408 </span>  EIP = *arg2<span class="Delimiter">;</span>
-<span id="L409" class="LineNr">409 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L433'>HEXWORD</a> &lt;&lt; EIP &lt;&lt; end<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="SalientComment">//:: push</span>
-<span id="L414" class="LineNr">414 </span>
-<span id="L415" class="LineNr">415 </span><span class="Delimiter">:(scenario push_mem_at_r32)</span>
-<span id="L416" class="LineNr">416 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
-<span id="L417" class="LineNr">417 </span><span class="Special">% Reg[ESP].u = 0x14;</span>
-<span id="L418" class="LineNr">418 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L419" class="LineNr">419 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L420" class="LineNr">420 </span>  ff  <span class="Constant">30</span>                                      <span class="Comment"># push *EAX to stack</span>
-<span id="L421" class="LineNr">421 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 110 (push r/m32) 000 (src EAX)</span>
-<span id="L422" class="LineNr">422 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L423" class="LineNr">423 </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="L424" class="LineNr">424 </span><span class="traceContains">+run: <a href='012elf.cc.html#L90'>push</a> r/m32</span>
-<span id="L425" class="LineNr">425 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span>
-<span id="L426" class="LineNr">426 </span><span class="traceContains">+run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000010</span>
-<span id="L427" class="LineNr">427 </span><span class="traceContains">+run: pushing value 0x000000af</span>
-<span id="L428" class="LineNr">428 </span>
-<span id="L429" class="LineNr">429 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
-<span id="L430" class="LineNr">430 </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="L431" class="LineNr">431 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; end<span class="Delimiter">();</span>
-<span id="L432" class="LineNr">432 </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="L433" class="LineNr">433 </span>  <a href='012elf.cc.html#L90'>push</a><span class="Delimiter">(</span>*val<span class="Delimiter">);</span>
-<span id="L434" class="LineNr">434 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L435" class="LineNr">435 </span><span class="Delimiter">}</span>
-<span id="L436" class="LineNr">436 </span>
-<span id="L437" class="LineNr">437 </span><span class="SalientComment">//:: pop</span>
-<span id="L438" class="LineNr">438 </span>
-<span id="L439" class="LineNr">439 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L440" class="LineNr">440 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><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 (pop)&quot;</span><span class="Delimiter">);</span>
-<span id="L441" class="LineNr">441 </span>
-<span id="L442" class="LineNr">442 </span><span class="Delimiter">:(scenario pop_mem_at_r32)</span>
-<span id="L443" class="LineNr">443 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
-<span id="L444" class="LineNr">444 </span><span class="Special">% Reg[ESP].u = 0x2000;</span>
-<span id="L445" class="LineNr">445 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L446" class="LineNr">446 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L447" class="LineNr">447 </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="L448" class="LineNr">448 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 000 (pop r/m32) 000 (dest EAX)</span>
-<span id="L449" class="LineNr">449 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L450" class="LineNr">450 </span><span class="Constant">30</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># 0x30</span>
-<span id="L451" class="LineNr">451 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L789'>pop</a> into r/m32</span>
-<span id="L452" class="LineNr">452 </span><span class="traceContains">+run: effective address is 0x00000060 (EAX)</span>
-<span id="L453" class="LineNr">453 </span><span class="traceContains">+run: popping value 0x00000030</span>
-<span id="L454" class="LineNr">454 </span><span class="traceContains">+run: incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00002004</span>
-<span id="L455" class="LineNr">455 </span>
-<span id="L456" class="LineNr">456 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L457" class="LineNr">457 </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="L458" class="LineNr">458 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L459" class="LineNr">459 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L460" class="LineNr">460 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L461" class="LineNr">461 </span>    <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Delimiter">{</span>
-<span id="L462" class="LineNr">462 </span>      <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;pop into r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L463" class="LineNr">463 </span>      <span class="Normal">int32_t</span>* dest = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L464" class="LineNr">464 </span>      *dest = <a href='013direct_addressing.cc.html#L789'>pop</a><span class="Delimiter">();</span>
-<span id="L465" class="LineNr">465 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L466" class="LineNr">466 </span>    <span class="Delimiter">}</span>
-<span id="L467" class="LineNr">467 </span>  <span class="Delimiter">}</span>
-<span id="L468" class="LineNr">468 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L469" class="LineNr">469 </span><span class="Delimiter">}</span>
-<span id="L470" class="LineNr">470 </span>
-<span id="L471" class="LineNr">471 </span><span class="SalientComment">//:: special-case for loading address from disp32 rather than register</span>
-<span id="L472" class="LineNr">472 </span>
-<span id="L473" class="LineNr">473 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_displacement)</span>
-<span id="L474" class="LineNr">474 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
-<span id="L475" class="LineNr">475 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L476" class="LineNr">476 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L477" class="LineNr">477 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  1d            <span class="PreProc">0</span><span class="Constant">0</span> <span class="Constant">20</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 *0x2000</span>
-<span id="L478" class="LineNr">478 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EBX) 101 (dest in disp32)</span>
-<span id="L479" class="LineNr">479 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L480" class="LineNr">480 </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="L481" class="LineNr">481 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L482" class="LineNr">482 </span><span class="traceContains">+run: effective address is 0x00002000 (disp32)</span>
-<span id="L483" class="LineNr">483 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L484" class="LineNr">484 </span>
-<span id="L485" class="LineNr">485 </span><span class="Delimiter">:(before &quot;End Mod 0 Special-cases(addr)&quot;)</span>
-<span id="L486" class="LineNr">486 </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="L487" class="LineNr">487 </span>  addr = <a href='011run.cc.html#L336'>next32</a><span class="Delimiter">();</span>
-<span id="L488" class="LineNr">488 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (disp32)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L489" class="LineNr">489 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L490" class="LineNr">490 </span>
-<span id="L491" class="LineNr">491 </span><span class="Comment">//:</span>
-<span id="L492" class="LineNr">492 </span>
-<span id="L493" class="LineNr">493 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32_plus_disp8)</span>
-<span id="L494" class="LineNr">494 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
-<span id="L495" class="LineNr">495 </span><span class="Special">% Reg[EAX].i = 0x1ffe;  // dest</span>
-<span id="L496" class="LineNr">496 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L497" class="LineNr">497 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L498" class="LineNr">498 </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="L499" class="LineNr">499 </span><span class="Comment"># ModR/M in binary: 01 (indirect+disp8 mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L500" class="LineNr">500 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L501" class="LineNr">501 </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="L502" class="LineNr">502 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L503" class="LineNr">503 </span><span class="traceContains">+run: effective address is initially 0x00001ffe (EAX)</span>
-<span id="L504" class="LineNr">504 </span><span class="traceContains">+run: effective address is 0x00002000 (after adding disp8)</span>
-<span id="L505" class="LineNr">505 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L506" class="LineNr">506 </span>
-<span id="L507" class="LineNr">507 </span><span class="Delimiter">:(before &quot;End Mod Special-cases(addr)&quot;)</span>
-<span id="L508" class="LineNr">508 </span><span class="Normal">case</span> <span class="Constant">1</span>:  <span class="Comment">// indirect + disp8 addressing</span>
-<span id="L509" class="LineNr">509 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L510" class="LineNr">510 </span>  <span class="Normal">default</span>:
-<span id="L511" class="LineNr">511 </span>    addr = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L512" class="LineNr">512 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L63'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L513" class="LineNr">513 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L514" class="LineNr">514 </span>  <span class="Comment">// End Mod 1 Special-cases(addr)</span>
-<span id="L515" class="LineNr">515 </span>  <span class="Delimiter">}</span>
-<span id="L516" class="LineNr">516 </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="L517" class="LineNr">517 </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#L363'>next</a><span class="Delimiter">());</span>
-<span id="L518" class="LineNr">518 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding disp8)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L519" class="LineNr">519 </span>  <span class="Delimiter">}</span>
-<span id="L520" class="LineNr">520 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L521" class="LineNr">521 </span>
-<span id="L522" class="LineNr">522 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32_plus_negative_disp8)</span>
-<span id="L523" class="LineNr">523 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
-<span id="L524" class="LineNr">524 </span><span class="Special">% Reg[EAX].i = 0x2001;  // dest</span>
-<span id="L525" class="LineNr">525 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L526" class="LineNr">526 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L527" class="LineNr">527 </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="L528" class="LineNr">528 </span><span class="Comment"># ModR/M in binary: 01 (indirect+disp8 mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L529" class="LineNr">529 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L530" class="LineNr">530 </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="L531" class="LineNr">531 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L532" class="LineNr">532 </span><span class="traceContains">+run: effective address is initially 0x00002001 (EAX)</span>
-<span id="L533" class="LineNr">533 </span><span class="traceContains">+run: effective address is 0x00002000 (after adding disp8)</span>
-<span id="L534" class="LineNr">534 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L535" class="LineNr">535 </span>
-<span id="L536" class="LineNr">536 </span><span class="Comment">//:</span>
-<span id="L537" class="LineNr">537 </span>
-<span id="L538" class="LineNr">538 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32_plus_disp32)</span>
-<span id="L539" class="LineNr">539 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
-<span id="L540" class="LineNr">540 </span><span class="Special">% Reg[EAX].i = 0x1ffe;  // dest</span>
-<span id="L541" class="LineNr">541 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L542" class="LineNr">542 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L543" class="LineNr">543 </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="L544" class="LineNr">544 </span><span class="Comment"># ModR/M in binary: 10 (indirect+disp32 mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L545" class="LineNr">545 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L546" class="LineNr">546 </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="L547" class="LineNr">547 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L548" class="LineNr">548 </span><span class="traceContains">+run: effective address is initially 0x00001ffe (EAX)</span>
-<span id="L549" class="LineNr">549 </span><span class="traceContains">+run: effective address is 0x00002000 (after adding disp32)</span>
-<span id="L550" class="LineNr">550 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L551" class="LineNr">551 </span>
-<span id="L552" class="LineNr">552 </span><span class="Delimiter">:(before &quot;End Mod Special-cases(addr)&quot;)</span>
-<span id="L553" class="LineNr">553 </span><span class="Normal">case</span> <span class="Constant">2</span>:  <span class="Comment">// indirect + disp32 addressing</span>
-<span id="L554" class="LineNr">554 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L555" class="LineNr">555 </span>  <span class="Normal">default</span>:
-<span id="L556" class="LineNr">556 </span>    addr = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L557" class="LineNr">557 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L63'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; end<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 class="Comment">// End Mod 2 Special-cases(addr)</span>
-<span id="L560" class="LineNr">560 </span>  <span class="Delimiter">}</span>
-<span id="L561" class="LineNr">561 </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="L562" class="LineNr">562 </span>    addr += <a href='011run.cc.html#L336'>next32</a><span class="Delimiter">();</span>
-<span id="L563" class="LineNr">563 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding disp32)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L564" class="LineNr">564 </span>  <span class="Delimiter">}</span>
-<span id="L565" class="LineNr">565 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L566" class="LineNr">566 </span>
-<span id="L567" class="LineNr">567 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32_plus_negative_disp32)</span>
-<span id="L568" class="LineNr">568 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
-<span id="L569" class="LineNr">569 </span><span class="Special">% Reg[EAX].i = 0x2001;  // dest</span>
-<span id="L570" class="LineNr">570 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L571" class="LineNr">571 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L572" class="LineNr">572 </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="L573" class="LineNr">573 </span><span class="Comment"># ModR/M in binary: 10 (indirect+disp32 mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L574" class="LineNr">574 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L575" class="LineNr">575 </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="L576" class="LineNr">576 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L577" class="LineNr">577 </span><span class="traceContains">+run: effective address is initially 0x00002001 (EAX)</span>
-<span id="L578" class="LineNr">578 </span><span class="traceContains">+run: effective address is 0x00002000 (after adding disp32)</span>
-<span id="L579" class="LineNr">579 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L580" class="LineNr">580 </span>
-<span id="L581" class="LineNr">581 </span><span class="SalientComment">//:: copy address (lea)</span>
+<span id="L346" class="LineNr">346 </span><span class="Delimiter">:(code)</span>
+<span id="L347" class="LineNr">347 </span><span class="Normal">void</span> <a href='014indirect_addressing.cc.html#L347'>test_compare_mem_at_r32_with_r32_equal</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L348" class="LineNr">348 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L349" class="LineNr">349 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x0a0b0c0d</span><span class="Delimiter">;</span>
+<span id="L350" class="LineNr">350 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L351" class="LineNr">351 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<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">&quot;  39     18                                    \n&quot;</span>  <span class="Comment">// compare EBX with *EAX</span>
+<span id="L354" class="LineNr">354 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
+<span id="L355" class="LineNr">355 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L356" class="LineNr">356 </span>      <span class="Constant">&quot;0d 0c 0b 0a\n&quot;</span>  <span class="Comment">// 0x0a0b0c0d</span>
+<span id="L357" class="LineNr">357 </span>  <span class="Delimiter">);</span>
+<span id="L358" class="LineNr">358 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L359" class="LineNr">359 </span>      <span class="Constant">&quot;run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32\n&quot;</span>
+<span id="L360" class="LineNr">360 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EAX)\n&quot;</span>
+<span id="L361" class="LineNr">361 </span>      <span class="Constant">&quot;run: SF=0; ZF=1; OF=0\n&quot;</span>
+<span id="L362" class="LineNr">362 </span>  <span class="Delimiter">);</span>
+<span id="L363" class="LineNr">363 </span><span class="Delimiter">}</span>
+<span id="L364" class="LineNr">364 </span>
+<span id="L365" class="LineNr">365 </span><span class="Comment">//:</span>
+<span id="L366" class="LineNr">366 </span>
+<span id="L367" class="LineNr">367 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L368" class="LineNr">368 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;3b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;compare: set SF if r32 &lt; rm32 (cmp)&quot;</span><span class="Delimiter">);</span>
+<span id="L369" class="LineNr">369 </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='014indirect_addressing.cc.html#L371'>test_compare_r32_with_mem_at_r32_greater</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L372" class="LineNr">372 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L373" class="LineNr">373 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x0a0b0c0d</span><span class="Delimiter">;</span>
+<span id="L374" class="LineNr">374 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L375" class="LineNr">375 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L376" class="LineNr">376 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L377" class="LineNr">377 </span>      <span class="Constant">&quot;  3b     18                                    \n&quot;</span>  <span class="Comment">// compare *EAX with EBX</span>
+<span id="L378" class="LineNr">378 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
+<span id="L379" class="LineNr">379 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L380" class="LineNr">380 </span>      <span class="Constant">&quot;07 0c 0b 0a\n&quot;</span>  <span class="Comment">// 0x0a0b0c0d</span>
+<span id="L381" class="LineNr">381 </span>  <span class="Delimiter">);</span>
+<span id="L382" class="LineNr">382 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L383" class="LineNr">383 </span>      <span class="Constant">&quot;run: compare r/m32 with EBX\n&quot;</span>
+<span id="L384" class="LineNr">384 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EAX)\n&quot;</span>
+<span id="L385" class="LineNr">385 </span>      <span class="Constant">&quot;run: SF=0; ZF=0; OF=0\n&quot;</span>
+<span id="L386" class="LineNr">386 </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="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L390" class="LineNr">390 </span><span class="Normal">case</span> <span class="Constant">0x3b</span>: <span class="Delimiter">{</span>  <span class="Comment">// set SF if r32 &lt; r/m32</span>
+<span id="L391" class="LineNr">391 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
+<span id="L392" class="LineNr">392 </span>  <span class="Normal">const</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="L393" class="LineNr">393 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L73'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L394" class="LineNr">394 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg1 = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg1]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
+<span id="L395" class="LineNr">395 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='013direct_addressing.cc.html#L38'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L396" class="LineNr">396 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp1 = arg1 - *arg2<span class="Delimiter">;</span>
+<span id="L397" class="LineNr">397 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L398" class="LineNr">398 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L399" class="LineNr">399 </span>  <span class="Normal">int64_t</span> tmp2 = arg1 - *arg2<span class="Delimiter">;</span>
+<span id="L400" class="LineNr">400 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
+<span id="L401" class="LineNr">401 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L80'>ZF</a> &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L81'>OF</a> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L402" class="LineNr">402 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L403" class="LineNr">403 </span><span class="Delimiter">}</span>
+<span id="L404" class="LineNr">404 </span>
+<span id="L405" class="LineNr">405 </span><span class="Delimiter">:(code)</span>
+<span id="L406" class="LineNr">406 </span><span class="Normal">void</span> <a href='014indirect_addressing.cc.html#L406'>test_compare_r32_with_mem_at_r32_lesser</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L407" class="LineNr">407 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L408" class="LineNr">408 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x0a0b0c07</span><span class="Delimiter">;</span>
+<span id="L409" class="LineNr">409 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L410" class="LineNr">410 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L411" class="LineNr">411 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L412" class="LineNr">412 </span>      <span class="Constant">&quot;  3b     18                                    \n&quot;</span>  <span class="Comment">// compare *EAX with EBX</span>
+<span id="L413" class="LineNr">413 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
+<span id="L414" class="LineNr">414 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L415" class="LineNr">415 </span>      <span class="Constant">&quot;0d 0c 0b 0a\n&quot;</span>  <span class="Comment">// 0x0a0b0c0d</span>
+<span id="L416" class="LineNr">416 </span>  <span class="Delimiter">);</span>
+<span id="L417" class="LineNr">417 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L418" class="LineNr">418 </span>      <span class="Constant">&quot;run: compare r/m32 with EBX\n&quot;</span>
+<span id="L419" class="LineNr">419 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EAX)\n&quot;</span>
+<span id="L420" class="LineNr">420 </span>      <span class="Constant">&quot;run: SF=1; ZF=0; OF=0\n&quot;</span>
+<span id="L421" class="LineNr">421 </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="Delimiter">:(code)</span>
+<span id="L425" class="LineNr">425 </span><span class="Normal">void</span> <a href='014indirect_addressing.cc.html#L425'>test_compare_r32_with_mem_at_r32_equal</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L426" class="LineNr">426 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L427" class="LineNr">427 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x0a0b0c0d</span><span class="Delimiter">;</span>
+<span id="L428" class="LineNr">428 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L429" class="LineNr">429 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L430" class="LineNr">430 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L431" class="LineNr">431 </span>      <span class="Constant">&quot;  3b     18                                    \n&quot;</span>  <span class="Comment">// compare *EAX with EBX</span>
+<span id="L432" class="LineNr">432 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
+<span id="L433" class="LineNr">433 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L434" class="LineNr">434 </span>      <span class="Constant">&quot;0d 0c 0b 0a\n&quot;</span>  <span class="Comment">// 0x0a0b0c0d</span>
+<span id="L435" class="LineNr">435 </span>  <span class="Delimiter">);</span>
+<span id="L436" class="LineNr">436 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L437" class="LineNr">437 </span>      <span class="Constant">&quot;run: compare r/m32 with EBX\n&quot;</span>
+<span id="L438" class="LineNr">438 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EAX)\n&quot;</span>
+<span id="L439" class="LineNr">439 </span>      <span class="Constant">&quot;run: SF=0; ZF=1; OF=0\n&quot;</span>
+<span id="L440" class="LineNr">440 </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">//:: copy (mov)</span>
+<span id="L444" class="LineNr">444 </span>
+<span id="L445" class="LineNr">445 </span><span class="Delimiter">:(code)</span>
+<span id="L446" class="LineNr">446 </span><span class="Normal">void</span> <a href='014indirect_addressing.cc.html#L446'>test_copy_r32_to_mem_at_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L447" class="LineNr">447 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0xaf</span><span class="Delimiter">;</span>
+<span id="L448" class="LineNr">448 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x60</span><span class="Delimiter">;</span>
+<span id="L449" class="LineNr">449 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L450" class="LineNr">450 </span>      <span class="Constant">&quot;== 0x1\n&quot;</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>      <span class="Constant">&quot;  89     18                                    \n&quot;</span>  <span class="Comment">// copy EBX to *EAX</span>
+<span id="L453" class="LineNr">453 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
+<span id="L454" class="LineNr">454 </span>  <span class="Delimiter">);</span>
+<span id="L455" class="LineNr">455 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L456" class="LineNr">456 </span>      <span class="Constant">&quot;run: copy <a href='010---vm.cc.html#L16'>EBX</a> to r/m32\n&quot;</span>
+<span id="L457" class="LineNr">457 </span>      <span class="Constant">&quot;run: effective address is 0x00000060 (EAX)\n&quot;</span>
+<span id="L458" class="LineNr">458 </span>      <span class="Constant">&quot;run: storing 0x000000af\n&quot;</span>
+<span id="L459" class="LineNr">459 </span>  <span class="Delimiter">);</span>
+<span id="L460" class="LineNr">460 </span><span class="Delimiter">}</span>
+<span id="L461" class="LineNr">461 </span>
+<span id="L462" class="LineNr">462 </span><span class="Comment">//:</span>
+<span id="L463" class="LineNr">463 </span>
+<span id="L464" class="LineNr">464 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L465" class="LineNr">465 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy rm32 to r32 (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L466" class="LineNr">466 </span>
+<span id="L467" class="LineNr">467 </span><span class="Delimiter">:(code)</span>
+<span id="L468" class="LineNr">468 </span><span class="Normal">void</span> <a href='014indirect_addressing.cc.html#L468'>test_copy_mem_at_r32_to_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L469" class="LineNr">469 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L470" class="LineNr">470 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L471" class="LineNr">471 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L472" class="LineNr">472 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L473" class="LineNr">473 </span>      <span class="Constant">&quot;  8b     18                                    \n&quot;</span>  <span class="Comment">// copy *EAX to EBX</span>
+<span id="L474" class="LineNr">474 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L475" class="LineNr">475 </span>      <span class="Constant">&quot;af 00 00 00\n&quot;</span>  <span class="Comment">// 0x000000af</span>
+<span id="L476" class="LineNr">476 </span>  <span class="Delimiter">);</span>
+<span id="L477" class="LineNr">477 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L478" class="LineNr">478 </span>      <span class="Constant">&quot;run: copy r/m32 to EBX\n&quot;</span>
+<span id="L479" class="LineNr">479 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EAX)\n&quot;</span>
+<span id="L480" class="LineNr">480 </span>      <span class="Constant">&quot;run: storing 0x000000af\n&quot;</span>
+<span id="L481" class="LineNr">481 </span>  <span class="Delimiter">);</span>
+<span id="L482" class="LineNr">482 </span><span class="Delimiter">}</span>
+<span id="L483" class="LineNr">483 </span>
+<span id="L484" class="LineNr">484 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L485" class="LineNr">485 </span><span class="Normal">case</span> <span class="Constant">0x8b</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy r32 to r/m32</span>
+<span id="L486" class="LineNr">486 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
+<span id="L487" class="LineNr">487 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> rdest = <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="L488" class="LineNr">488 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy r/m32 to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L73'>rname</a><span class="Delimiter">(</span>rdest<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L489" class="LineNr">489 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* src = <a href='013direct_addressing.cc.html#L38'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L490" class="LineNr">490 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rdest]<span class="Delimiter">.</span>i = *src<span class="Delimiter">;</span>
+<span id="L491" class="LineNr">491 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L440'>HEXWORD</a> &lt;&lt; *src &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L492" class="LineNr">492 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L493" class="LineNr">493 </span><span class="Delimiter">}</span>
+<span id="L494" class="LineNr">494 </span>
+<span id="L495" class="LineNr">495 </span><span class="SalientComment">//:: jump</span>
+<span id="L496" class="LineNr">496 </span>
+<span id="L497" class="LineNr">497 </span><span class="Delimiter">:(code)</span>
+<span id="L498" class="LineNr">498 </span><span class="Normal">void</span> <a href='014indirect_addressing.cc.html#L498'>test_jump_mem_at_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L499" class="LineNr">499 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L500" class="LineNr">500 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L501" class="LineNr">501 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L502" class="LineNr">502 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L503" class="LineNr">503 </span>      <span class="Constant">&quot;  ff     20                                    \n&quot;</span>  <span class="Comment">// jump to *EAX</span>
+<span id="L504" class="LineNr">504 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 100 (jump to r/m32) 000 (src EAX)</span>
+<span id="L505" class="LineNr">505 </span>      <span class="Constant">&quot;  05                                 00 00 00 01\n&quot;</span>
+<span id="L506" class="LineNr">506 </span>      <span class="Constant">&quot;  05                                 00 00 00 02\n&quot;</span>
+<span id="L507" class="LineNr">507 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L508" class="LineNr">508 </span>      <span class="Constant">&quot;08 00 00 00\n&quot;</span>  <span class="Comment">// 0x00000008</span>
+<span id="L509" class="LineNr">509 </span>  <span class="Delimiter">);</span>
+<span id="L510" class="LineNr">510 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L511" class="LineNr">511 </span>      <span class="Constant">&quot;run: 0x00000001 opcode: ff\n&quot;</span>
+<span id="L512" class="LineNr">512 </span>      <span class="Constant">&quot;run: jump to r/m32\n&quot;</span>
+<span id="L513" class="LineNr">513 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EAX)\n&quot;</span>
+<span id="L514" class="LineNr">514 </span>      <span class="Constant">&quot;run: jumping to 0x00000008\n&quot;</span>
+<span id="L515" class="LineNr">515 </span>      <span class="Constant">&quot;run: 0x00000008 opcode: 05\n&quot;</span>
+<span id="L516" class="LineNr">516 </span>  <span class="Delimiter">);</span>
+<span id="L517" class="LineNr">517 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: 0x00000003 opcode: 05&quot;</span><span class="Delimiter">);</span>
+<span id="L518" class="LineNr">518 </span><span class="Delimiter">}</span>
+<span id="L519" class="LineNr">519 </span>
+<span id="L520" class="LineNr">520 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
+<span id="L521" class="LineNr">521 </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="L522" class="LineNr">522 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; end<span class="Delimiter">();</span>
+<span id="L523" class="LineNr">523 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='013direct_addressing.cc.html#L38'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L524" class="LineNr">524 </span>  EIP = *arg2<span class="Delimiter">;</span>
+<span id="L525" class="LineNr">525 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L440'>HEXWORD</a> &lt;&lt; EIP &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L526" class="LineNr">526 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L527" class="LineNr">527 </span><span class="Delimiter">}</span>
+<span id="L528" class="LineNr">528 </span>
+<span id="L529" class="LineNr">529 </span><span class="SalientComment">//:: push</span>
+<span id="L530" class="LineNr">530 </span>
+<span id="L531" class="LineNr">531 </span><span class="Delimiter">:(code)</span>
+<span id="L532" class="LineNr">532 </span><span class="Normal">void</span> <a href='014indirect_addressing.cc.html#L532'>test_push_mem_at_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L533" class="LineNr">533 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L534" class="LineNr">534 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u = <span class="Constant">0x14</span><span class="Delimiter">;</span>
+<span id="L535" class="LineNr">535 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L536" class="LineNr">536 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L537" class="LineNr">537 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L538" class="LineNr">538 </span>      <span class="Constant">&quot;  ff     30                                    \n&quot;</span>  <span class="Comment">// push *EAX to stack</span>
+<span id="L539" class="LineNr">539 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L540" class="LineNr">540 </span>      <span class="Constant">&quot;af 00 00 00\n&quot;</span>  <span class="Comment">// 0x000000af</span>
+<span id="L541" class="LineNr">541 </span>  <span class="Delimiter">);</span>
+<span id="L542" class="LineNr">542 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L543" class="LineNr">543 </span>      <span class="Constant">&quot;run: <a href='012elf.cc.html#L90'>push</a> r/m32\n&quot;</span>
+<span id="L544" class="LineNr">544 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EAX)\n&quot;</span>
+<span id="L545" class="LineNr">545 </span>      <span class="Constant">&quot;run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000010\n&quot;</span>
+<span id="L546" class="LineNr">546 </span>      <span class="Constant">&quot;run: pushing value 0x000000af\n&quot;</span>
+<span id="L547" class="LineNr">547 </span>  <span class="Delimiter">);</span>
+<span id="L548" class="LineNr">548 </span><span class="Delimiter">}</span>
+<span id="L549" class="LineNr">549 </span>
+<span id="L550" class="LineNr">550 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
+<span id="L551" class="LineNr">551 </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="L552" class="LineNr">552 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; end<span class="Delimiter">();</span>
+<span id="L553" class="LineNr">553 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* val = <a href='013direct_addressing.cc.html#L38'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L554" class="LineNr">554 </span>  <a href='012elf.cc.html#L90'>push</a><span class="Delimiter">(</span>*val<span class="Delimiter">);</span>
+<span id="L555" class="LineNr">555 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L556" class="LineNr">556 </span><span class="Delimiter">}</span>
+<span id="L557" class="LineNr">557 </span>
+<span id="L558" class="LineNr">558 </span><span class="SalientComment">//:: pop</span>
+<span id="L559" class="LineNr">559 </span>
+<span id="L560" class="LineNr">560 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L561" class="LineNr">561 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><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 (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L562" class="LineNr">562 </span>
+<span id="L563" class="LineNr">563 </span><span class="Delimiter">:(code)</span>
+<span id="L564" class="LineNr">564 </span><span class="Normal">void</span> <a href='014indirect_addressing.cc.html#L564'>test_pop_mem_at_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L565" class="LineNr">565 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x60</span><span class="Delimiter">;</span>
+<span id="L566" class="LineNr">566 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L567" class="LineNr">567 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L568" class="LineNr">568 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L569" class="LineNr">569 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L570" class="LineNr">570 </span>      <span class="Constant">&quot;  8f     00                                    \n&quot;</span>  <span class="Comment">// pop stack into *EAX</span>
+<span id="L571" class="LineNr">571 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 000 (pop r/m32) 000 (dest EAX)</span>
+<span id="L572" class="LineNr">572 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L573" class="LineNr">573 </span>      <span class="Constant">&quot;30 00 00 00\n&quot;</span>  <span class="Comment">// 0x00000030</span>
+<span id="L574" class="LineNr">574 </span>  <span class="Delimiter">);</span>
+<span id="L575" class="LineNr">575 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L576" class="LineNr">576 </span>      <span class="Constant">&quot;run: <a href='013direct_addressing.cc.html#L960'>pop</a> into r/m32\n&quot;</span>
+<span id="L577" class="LineNr">577 </span>      <span class="Constant">&quot;run: effective address is 0x00000060 (EAX)\n&quot;</span>
+<span id="L578" class="LineNr">578 </span>      <span class="Constant">&quot;run: popping value 0x00000030\n&quot;</span>
+<span id="L579" class="LineNr">579 </span>      <span class="Constant">&quot;run: incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00002004\n&quot;</span>
+<span id="L580" class="LineNr">580 </span>  <span class="Delimiter">);</span>
+<span id="L581" class="LineNr">581 </span><span class="Delimiter">}</span>
 <span id="L582" class="LineNr">582 </span>
-<span id="L583" class="LineNr">583 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L584" class="LineNr">584 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy address in rm32 into r32 (lea)&quot;</span><span class="Delimiter">);</span>
-<span id="L585" class="LineNr">585 </span>
-<span id="L586" class="LineNr">586 </span><span class="Delimiter">:(scenario copy_address)</span>
-<span id="L587" class="LineNr">587 </span><span class="Special">% Reg[EAX].u = 0x2000;</span>
-<span id="L588" class="LineNr">588 </span>== <span class="Constant">0x1</span>
-<span id="L589" class="LineNr">589 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L590" class="LineNr">590 </span>  8d  <span class="Constant">18</span>
-<span id="L591" class="LineNr">591 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (dest EBX) 000 (src EAX)</span>
-<span id="L592" class="LineNr">592 </span><span class="traceContains">+run: copy address into <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L593" class="LineNr">593 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span>
-<span id="L594" class="LineNr">594 </span>
-<span id="L595" class="LineNr">595 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L596" class="LineNr">596 </span><span class="Normal">case</span> <span class="Constant">0x8d</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy address of m32 to r32</span>
-<span id="L597" class="LineNr">597 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L598" class="LineNr">598 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg1 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L599" class="LineNr">599 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy address into &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L63'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L600" class="LineNr">600 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg1]<span class="Delimiter">.</span>u = <a href='013direct_addressing.cc.html#L43'>effective_address_number</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L601" class="LineNr">601 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L602" class="LineNr">602 </span><span class="Delimiter">}</span>
+<span id="L583" class="LineNr">583 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L584" class="LineNr">584 </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="L585" class="LineNr">585 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
+<span id="L586" class="LineNr">586 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L587" class="LineNr">587 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L588" class="LineNr">588 </span>    <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Delimiter">{</span>
+<span id="L589" class="LineNr">589 </span>      <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;pop into r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L590" class="LineNr">590 </span>      <span class="Normal">int32_t</span>* dest = <a href='013direct_addressing.cc.html#L38'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L591" class="LineNr">591 </span>      *dest = <a href='013direct_addressing.cc.html#L960'>pop</a><span class="Delimiter">();</span>
+<span id="L592" class="LineNr">592 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L593" class="LineNr">593 </span>    <span class="Delimiter">}</span>
+<span id="L594" class="LineNr">594 </span>  <span class="Delimiter">}</span>
+<span id="L595" class="LineNr">595 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L596" class="LineNr">596 </span><span class="Delimiter">}</span>
+<span id="L597" class="LineNr">597 </span>
+<span id="L598" class="LineNr">598 </span><span class="SalientComment">//:: special-case for loading address from disp32 rather than register</span>
+<span id="L599" class="LineNr">599 </span>
+<span id="L600" class="LineNr">600 </span><span class="Delimiter">:(code)</span>
+<span id="L601" class="LineNr">601 </span><span class="Normal">void</span> <a href='014indirect_addressing.cc.html#L601'>test_add_r32_to_mem_at_displacement</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L602" class="LineNr">602 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x10</span><span class="Delimiter">;</span>  <span class="Comment">// source</span>
+<span id="L603" class="LineNr">603 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L604" class="LineNr">604 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L605" class="LineNr">605 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L606" class="LineNr">606 </span>      <span class="Constant">&quot;  01     1d            00 20 00 00             \n&quot;</span>  <span class="Comment">// add EBX to *0x2000</span>
+<span id="L607" class="LineNr">607 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 011 (src EBX) 101 (dest in disp32)</span>
+<span id="L608" class="LineNr">608 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L609" class="LineNr">609 </span>      <span class="Constant">&quot;01 00 00 00\n&quot;</span>  <span class="Comment">// 0x00000001</span>
+<span id="L610" class="LineNr">610 </span>  <span class="Delimiter">);</span>
+<span id="L611" class="LineNr">611 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L612" class="LineNr">612 </span>      <span class="Constant">&quot;run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32\n&quot;</span>
+<span id="L613" class="LineNr">613 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (disp32)\n&quot;</span>
+<span id="L614" class="LineNr">614 </span>      <span class="Constant">&quot;run: storing 0x00000011\n&quot;</span>
+<span id="L615" class="LineNr">615 </span>  <span class="Delimiter">);</span>
+<span id="L616" class="LineNr">616 </span><span class="Delimiter">}</span>
+<span id="L617" class="LineNr">617 </span>
+<span id="L618" class="LineNr">618 </span><span class="Delimiter">:(before &quot;End Mod 0 Special-cases(addr)&quot;)</span>
+<span id="L619" class="LineNr">619 </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="L620" class="LineNr">620 </span>  addr = <a href='011run.cc.html#L366'>next32</a><span class="Delimiter">();</span>
+<span id="L621" class="LineNr">621 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (disp32)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L622" class="LineNr">622 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L623" class="LineNr">623 </span>
+<span id="L624" class="LineNr">624 </span><span class="Comment">//:</span>
+<span id="L625" class="LineNr">625 </span>
+<span id="L626" class="LineNr">626 </span><span class="Delimiter">:(code)</span>
+<span id="L627" class="LineNr">627 </span><span class="Normal">void</span> <a href='014indirect_addressing.cc.html#L627'>test_add_r32_to_mem_at_r32_plus_disp8</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L628" class="LineNr">628 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x10</span><span class="Delimiter">;</span>  <span class="Comment">// source</span>
+<span id="L629" class="LineNr">629 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x1ffe</span><span class="Delimiter">;</span>  <span class="Comment">// dest</span>
+<span id="L630" class="LineNr">630 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L631" class="LineNr">631 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L632" class="LineNr">632 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L633" class="LineNr">633 </span>      <span class="Constant">&quot;  01     58            02                      \n&quot;</span>  <span class="Comment">// add EBX to *(EAX+2)</span>
+<span id="L634" class="LineNr">634 </span>      <span class="Comment">// ModR/M in binary: 01 (indirect+disp8 mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L635" class="LineNr">635 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L636" class="LineNr">636 </span>      <span class="Constant">&quot;01 00 00 00\n&quot;</span>  <span class="Comment">// 0x00000001</span>
+<span id="L637" class="LineNr">637 </span>  <span class="Delimiter">);</span>
+<span id="L638" class="LineNr">638 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L639" class="LineNr">639 </span>      <span class="Constant">&quot;run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32\n&quot;</span>
+<span id="L640" class="LineNr">640 </span>      <span class="Constant">&quot;run: effective address is initially 0x00001ffe (EAX)\n&quot;</span>
+<span id="L641" class="LineNr">641 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (after adding disp8)\n&quot;</span>
+<span id="L642" class="LineNr">642 </span>      <span class="Constant">&quot;run: storing 0x00000011\n&quot;</span>
+<span id="L643" class="LineNr">643 </span>  <span class="Delimiter">);</span>
+<span id="L644" class="LineNr">644 </span><span class="Delimiter">}</span>
+<span id="L645" class="LineNr">645 </span>
+<span id="L646" class="LineNr">646 </span><span class="Delimiter">:(before &quot;End Mod Special-cases(addr)&quot;)</span>
+<span id="L647" class="LineNr">647 </span><span class="Normal">case</span> <span class="Constant">1</span>:  <span class="Comment">// indirect + disp8 addressing</span>
+<span id="L648" class="LineNr">648 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L649" class="LineNr">649 </span>  <span class="Normal">default</span>:
+<span id="L650" class="LineNr">650 </span>    addr = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
+<span id="L651" class="LineNr">651 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L73'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L652" class="LineNr">652 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L653" class="LineNr">653 </span>  <span class="Comment">// End Mod 1 Special-cases(addr)</span>
+<span id="L654" class="LineNr">654 </span>  <span class="Delimiter">}</span>
+<span id="L655" class="LineNr">655 </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="L656" class="LineNr">656 </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#L363'>next</a><span class="Delimiter">());</span>
+<span id="L657" class="LineNr">657 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding disp8)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L658" class="LineNr">658 </span>  <span class="Delimiter">}</span>
+<span id="L659" class="LineNr">659 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L660" class="LineNr">660 </span>
+<span id="L661" class="LineNr">661 </span><span class="Delimiter">:(code)</span>
+<span id="L662" class="LineNr">662 </span><span class="Normal">void</span> <a href='014indirect_addressing.cc.html#L662'>test_add_r32_to_mem_at_r32_plus_negative_disp8</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L663" class="LineNr">663 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x10</span><span class="Delimiter">;</span>  <span class="Comment">// source</span>
+<span id="L664" class="LineNr">664 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x2001</span><span class="Delimiter">;</span>  <span class="Comment">// dest</span>
+<span id="L665" class="LineNr">665 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L666" class="LineNr">666 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L667" class="LineNr">667 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L668" class="LineNr">668 </span>      <span class="Constant">&quot;  01     58            ff                      \n&quot;</span>  <span class="Comment">// add EBX to *(EAX-1)</span>
+<span id="L669" class="LineNr">669 </span>      <span class="Comment">// ModR/M in binary: 01 (indirect+disp8 mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L670" class="LineNr">670 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L671" class="LineNr">671 </span>      <span class="Constant">&quot;01 00 00 00\n&quot;</span>  <span class="Comment">// 0x00000001</span>
+<span id="L672" class="LineNr">672 </span>  <span class="Delimiter">);</span>
+<span id="L673" class="LineNr">673 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L674" class="LineNr">674 </span>      <span class="Constant">&quot;run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32\n&quot;</span>
+<span id="L675" class="LineNr">675 </span>      <span class="Constant">&quot;run: effective address is initially 0x00002001 (EAX)\n&quot;</span>
+<span id="L676" class="LineNr">676 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (after adding disp8)\n&quot;</span>
+<span id="L677" class="LineNr">677 </span>      <span class="Constant">&quot;run: storing 0x00000011\n&quot;</span>
+<span id="L678" class="LineNr">678 </span>  <span class="Delimiter">);</span>
+<span id="L679" class="LineNr">679 </span><span class="Delimiter">}</span>
+<span id="L680" class="LineNr">680 </span>
+<span id="L681" class="LineNr">681 </span><span class="Comment">//:</span>
+<span id="L682" class="LineNr">682 </span>
+<span id="L683" class="LineNr">683 </span><span class="Delimiter">:(code)</span>
+<span id="L684" class="LineNr">684 </span><span class="Normal">void</span> <a href='014indirect_addressing.cc.html#L684'>test_add_r32_to_mem_at_r32_plus_disp32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L685" class="LineNr">685 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x10</span><span class="Delimiter">;</span>  <span class="Comment">// source</span>
+<span id="L686" class="LineNr">686 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x1ffe</span><span class="Delimiter">;</span>  <span class="Comment">// dest</span>
+<span id="L687" class="LineNr">687 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L688" class="LineNr">688 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L689" class="LineNr">689 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L690" class="LineNr">690 </span>      <span class="Constant">&quot;  01     98            02 00 00 00             \n&quot;</span>  <span class="Comment">// add EBX to *(EAX+2)</span>
+<span id="L691" class="LineNr">691 </span>      <span class="Comment">// ModR/M in binary: 10 (indirect+disp32 mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L692" class="LineNr">692 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L693" class="LineNr">693 </span>      <span class="Constant">&quot;01 00 00 00\n&quot;</span>  <span class="Comment">// 0x00000001</span>
+<span id="L694" class="LineNr">694 </span>  <span class="Delimiter">);</span>
+<span id="L695" class="LineNr">695 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L696" class="LineNr">696 </span>      <span class="Constant">&quot;run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32\n&quot;</span>
+<span id="L697" class="LineNr">697 </span>      <span class="Constant">&quot;run: effective address is initially 0x00001ffe (EAX)\n&quot;</span>
+<span id="L698" class="LineNr">698 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (after adding disp32)\n&quot;</span>
+<span id="L699" class="LineNr">699 </span>      <span class="Constant">&quot;run: storing 0x00000011\n&quot;</span>
+<span id="L700" class="LineNr">700 </span>  <span class="Delimiter">);</span>
+<span id="L701" class="LineNr">701 </span><span class="Delimiter">}</span>
+<span id="L702" class="LineNr">702 </span>
+<span id="L703" class="LineNr">703 </span><span class="Delimiter">:(before &quot;End Mod Special-cases(addr)&quot;)</span>
+<span id="L704" class="LineNr">704 </span><span class="Normal">case</span> <span class="Constant">2</span>:  <span class="Comment">// indirect + disp32 addressing</span>
+<span id="L705" class="LineNr">705 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L706" class="LineNr">706 </span>  <span class="Normal">default</span>:
+<span id="L707" class="LineNr">707 </span>    addr = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
+<span id="L708" class="LineNr">708 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L73'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L709" class="LineNr">709 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L710" class="LineNr">710 </span>  <span class="Comment">// End Mod 2 Special-cases(addr)</span>
+<span id="L711" class="LineNr">711 </span>  <span class="Delimiter">}</span>
+<span id="L712" class="LineNr">712 </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="L713" class="LineNr">713 </span>    addr += <a href='011run.cc.html#L366'>next32</a><span class="Delimiter">();</span>
+<span id="L714" class="LineNr">714 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding disp32)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L715" class="LineNr">715 </span>  <span class="Delimiter">}</span>
+<span id="L716" class="LineNr">716 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L717" class="LineNr">717 </span>
+<span id="L718" class="LineNr">718 </span><span class="Delimiter">:(code)</span>
+<span id="L719" class="LineNr">719 </span><span class="Normal">void</span> <a href='014indirect_addressing.cc.html#L719'>test_add_r32_to_mem_at_r32_plus_negative_disp32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L720" class="LineNr">720 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x10</span><span class="Delimiter">;</span>  <span class="Comment">// source</span>
+<span id="L721" class="LineNr">721 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x2001</span><span class="Delimiter">;</span>  <span class="Comment">// dest</span>
+<span id="L722" class="LineNr">722 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L723" class="LineNr">723 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L724" class="LineNr">724 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L725" class="LineNr">725 </span>      <span class="Constant">&quot;  01     98            ff ff ff ff             \n&quot;</span>  <span class="Comment">// add EBX to *(EAX-1)</span>
+<span id="L726" class="LineNr">726 </span>      <span class="Comment">// ModR/M in binary: 10 (indirect+disp32 mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L727" class="LineNr">727 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L728" class="LineNr">728 </span>      <span class="Constant">&quot;01 00 00 00\n&quot;</span>  <span class="Comment">// 0x00000001</span>
+<span id="L729" class="LineNr">729 </span>  <span class="Delimiter">);</span>
+<span id="L730" class="LineNr">730 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L731" class="LineNr">731 </span>      <span class="Constant">&quot;run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32\n&quot;</span>
+<span id="L732" class="LineNr">732 </span>      <span class="Constant">&quot;run: effective address is initially 0x00002001 (EAX)\n&quot;</span>
+<span id="L733" class="LineNr">733 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (after adding disp32)\n&quot;</span>
+<span id="L734" class="LineNr">734 </span>      <span class="Constant">&quot;run: storing 0x00000011\n&quot;</span>
+<span id="L735" class="LineNr">735 </span>  <span class="Delimiter">);</span>
+<span id="L736" class="LineNr">736 </span><span class="Delimiter">}</span>
+<span id="L737" class="LineNr">737 </span>
+<span id="L738" class="LineNr">738 </span><span class="SalientComment">//:: copy address (lea)</span>
+<span id="L739" class="LineNr">739 </span>
+<span id="L740" class="LineNr">740 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L741" class="LineNr">741 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy address in rm32 into r32 (lea)&quot;</span><span class="Delimiter">);</span>
+<span id="L742" class="LineNr">742 </span>
+<span id="L743" class="LineNr">743 </span><span class="Delimiter">:(code)</span>
+<span id="L744" class="LineNr">744 </span><span class="Normal">void</span> <a href='014indirect_addressing.cc.html#L744'>test_copy_address</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L745" class="LineNr">745 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>u = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L746" class="LineNr">746 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L747" class="LineNr">747 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L748" class="LineNr">748 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L749" class="LineNr">749 </span>      <span class="Constant">&quot;  8d     18                                    \n&quot;</span>  <span class="Comment">// copy address in EAX into EBX</span>
+<span id="L750" class="LineNr">750 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 011 (dest EBX) 000 (src EAX)</span>
+<span id="L751" class="LineNr">751 </span>  <span class="Delimiter">);</span>
+<span id="L752" class="LineNr">752 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L753" class="LineNr">753 </span>      <span class="Constant">&quot;run: copy address into EBX\n&quot;</span>
+<span id="L754" class="LineNr">754 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EAX)\n&quot;</span>
+<span id="L755" class="LineNr">755 </span>  <span class="Delimiter">);</span>
+<span id="L756" class="LineNr">756 </span><span class="Delimiter">}</span>
+<span id="L757" class="LineNr">757 </span>
+<span id="L758" class="LineNr">758 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L759" class="LineNr">759 </span><span class="Normal">case</span> <span class="Constant">0x8d</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy address of m32 to r32</span>
+<span id="L760" class="LineNr">760 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
+<span id="L761" class="LineNr">761 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg1 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L762" class="LineNr">762 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy address into &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L73'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L763" class="LineNr">763 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg1]<span class="Delimiter">.</span>u = <a href='013direct_addressing.cc.html#L53'>effective_address_number</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L764" class="LineNr">764 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L765" class="LineNr">765 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/015immediate_addressing.cc.html b/html/subx/015immediate_addressing.cc.html
index c41a98cd..a413589a 100644
--- a/html/subx/015immediate_addressing.cc.html
+++ b/html/subx/015immediate_addressing.cc.html
@@ -14,8 +14,7 @@ pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-
 body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
-.PreProc { color: #c000c0; }
+.CommentedCode { color: #8a8a8a; }
 .LineNr { }
 .Constant { color: #008787; }
 .SalientComment { color: #0000af; }
@@ -24,8 +23,7 @@ a { color:inherit; }
 .Identifier { color: #af5f00; }
 .Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 .Comment { color: #005faf; }
-.CommentedCode { color: #8a8a8a; }
-.traceContains { color: #005f00; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
@@ -64,655 +62,852 @@ 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&quot;)</span>
-<span id="L4" class="LineNr">  4 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;81&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop (add/sub/and/or/xor/cmp)&quot;</span><span class="Delimiter">);</span>
+<span id="L4" class="LineNr">  4 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;81&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop (add/sub/and/or/xor/cmp)&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>
-<span id="L8" class="LineNr">  8 </span>== <span class="Constant">0x1</span>
-<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='037heap.cc.html#L23'>imm32</a> 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='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a</span>
-<span id="L15" class="LineNr"> 15 </span><span class="traceContains">+run: subop add</span>
-<span id="L16" class="LineNr"> 16 </span><span class="traceContains">+run: storing 0x0d0c0b0b</span>
-<span id="L17" class="LineNr"> 17 </span>
-<span id="L18" class="LineNr"> 18 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L19" class="LineNr"> 19 </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="L20" class="LineNr"> 20 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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='037heap.cc.html#L23'>imm32</a> with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L21" class="LineNr"> 21 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</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">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L336'>next32</a><span class="Delimiter">();</span>
-<span id="L24" class="LineNr"> 24 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;imm32 is 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L25" class="LineNr"> 25 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
-<span id="L26" class="LineNr"> 26 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L27" class="LineNr"> 27 </span>  <span class="Normal">case</span> <span class="Constant">0</span>:
-<span id="L28" class="LineNr"> 28 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; end<span class="Delimiter">();</span>
-<span id="L29" class="LineNr"> 29 </span>    <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L30" class="LineNr"> 30 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L31" class="LineNr"> 31 </span>  <span class="Comment">// End Op 81 Subops</span>
-<span id="L32" class="LineNr"> 32 </span>  <span class="Normal">default</span>:
-<span id="L33" class="LineNr"> 33 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized subop for opcode 81: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L34" class="LineNr"> 34 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</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="Identifier">break</span><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><span class="Comment">//:</span>
-<span id="L40" class="LineNr"> 40 </span>
-<span id="L41" class="LineNr"> 41 </span><span class="Delimiter">:(scenario add_imm32_to_mem_at_r32)</span>
-<span id="L42" class="LineNr"> 42 </span><span class="Special">% Reg[EBX].i = 0x2000;</span>
-<span id="L43" class="LineNr"> 43 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
-<span id="L44" class="LineNr"> 44 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L45" class="LineNr"> 45 </span>  <span class="Constant">81</span>  <span class="PreProc">0</span><span class="Constant">3</span>                          0a 0b 0c 0d  <span class="Comment"># add 0x0d0c0b0a to *EBX</span>
-<span id="L46" class="LineNr"> 46 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 000 (add imm32) 011 (dest EBX)</span>
-<span id="L47" class="LineNr"> 47 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L48" class="LineNr"> 48 </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="L49" class="LineNr"> 49 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
-<span id="L50" class="LineNr"> 50 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
-<span id="L51" class="LineNr"> 51 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a</span>
-<span id="L52" class="LineNr"> 52 </span><span class="traceContains">+run: subop add</span>
-<span id="L53" class="LineNr"> 53 </span><span class="traceContains">+run: storing 0x0d0c0b0b</span>
-<span id="L54" class="LineNr"> 54 </span>
-<span id="L55" class="LineNr"> 55 </span><span class="SalientComment">//:: subtract</span>
-<span id="L56" class="LineNr"> 56 </span>
-<span id="L57" class="LineNr"> 57 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L58" class="LineNr"> 58 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;2d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract <a href='037heap.cc.html#L23'>imm32</a> from <a href='010---vm.cc.html#L13'>EAX</a> (sub)&quot;</span><span class="Delimiter">);</span>
-<span id="L59" class="LineNr"> 59 </span>
-<span id="L60" class="LineNr"> 60 </span><span class="Delimiter">:(scenario subtract_imm32_from_eax)</span>
-<span id="L61" class="LineNr"> 61 </span><span class="Special">% Reg[EAX].i = 0x0d0c0baa;</span>
-<span id="L62" class="LineNr"> 62 </span>== <span class="Constant">0x1</span>
-<span id="L63" class="LineNr"> 63 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L64" class="LineNr"> 64 </span>  2d                              0a 0b 0c 0d  <span class="Comment"># subtract 0x0d0c0b0a from EAX</span>
-<span id="L65" class="LineNr"> 65 </span><span class="traceContains">+run: subtract <a href='037heap.cc.html#L23'>imm32</a> 0x0d0c0b0a from <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L66" class="LineNr"> 66 </span><span class="traceContains">+run: storing 0x000000a0</span>
-<span id="L67" class="LineNr"> 67 </span>
-<span id="L68" class="LineNr"> 68 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L69" class="LineNr"> 69 </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="L70" class="LineNr"> 70 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L336'>next32</a><span class="Delimiter">();</span>
-<span id="L71" class="LineNr"> 71 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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='037heap.cc.html#L23'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; from EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L72" class="LineNr"> 72 </span>  <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L73" class="LineNr"> 73 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L74" class="LineNr"> 74 </span><span class="Delimiter">}</span>
-<span id="L75" class="LineNr"> 75 </span>
-<span id="L76" class="LineNr"> 76 </span><span class="Comment">//:</span>
-<span id="L77" class="LineNr"> 77 </span>
-<span id="L78" class="LineNr"> 78 </span><span class="Delimiter">:(scenario subtract_imm32_from_mem_at_r32)</span>
-<span id="L79" class="LineNr"> 79 </span><span class="Special">% Reg[EBX].i = 0x2000;</span>
-<span id="L80" class="LineNr"> 80 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
-<span id="L81" class="LineNr"> 81 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L82" class="LineNr"> 82 </span>  <span class="Constant">81</span>  2b                          <span class="PreProc">0</span><span class="Constant">1</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># subtract 1 from *EBX</span>
-<span id="L83" class="LineNr"> 83 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 101 (subtract imm32) 011 (dest EBX)</span>
-<span id="L84" class="LineNr"> 84 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L85" class="LineNr"> 85 </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="L86" class="LineNr"> 86 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
-<span id="L87" class="LineNr"> 87 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
-<span id="L88" class="LineNr"> 88 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x00000001</span>
-<span id="L89" class="LineNr"> 89 </span><span class="traceContains">+run: subop subtract</span>
-<span id="L90" class="LineNr"> 90 </span><span class="traceContains">+run: storing 0x00000009</span>
-<span id="L91" class="LineNr"> 91 </span>
-<span id="L92" class="LineNr"> 92 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
-<span id="L93" class="LineNr"> 93 </span><span class="Normal">case</span> <span class="Constant">5</span>: <span class="Delimiter">{</span>
-<span id="L94" class="LineNr"> 94 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop subtract&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L95" class="LineNr"> 95 </span>  <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L96" class="LineNr"> 96 </span>  <span class="Identifier">break</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="Comment">//:</span>
-<span id="L100" class="LineNr">100 </span>
-<span id="L101" class="LineNr">101 </span><span class="Delimiter">:(scenario subtract_imm32_from_r32)</span>
-<span id="L102" class="LineNr">102 </span><span class="Special">% Reg[EBX].i = 10;</span>
-<span id="L103" class="LineNr">103 </span>== <span class="Constant">0x1</span>
-<span id="L104" class="LineNr">104 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L105" class="LineNr">105 </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="L106" class="LineNr">106 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 101 (subtract imm32) 011 (dest EBX)</span>
-<span id="L107" class="LineNr">107 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
-<span id="L108" class="LineNr">108 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L109" class="LineNr">109 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x00000001</span>
-<span id="L110" class="LineNr">110 </span><span class="traceContains">+run: subop subtract</span>
-<span id="L111" class="LineNr">111 </span><span class="traceContains">+run: storing 0x00000009</span>
-<span id="L112" class="LineNr">112 </span>
-<span id="L113" class="LineNr">113 </span><span class="SalientComment">//:: shift left</span>
-<span id="L114" class="LineNr">114 </span>
-<span id="L115" class="LineNr">115 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L116" class="LineNr">116 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c1&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;shift rm32 by imm8 bits depending on subop (sal/sar/shl/shr)&quot;</span><span class="Delimiter">);</span>
-<span id="L117" class="LineNr">117 </span>
-<span id="L118" class="LineNr">118 </span><span class="Delimiter">:(scenario shift_left_r32_with_imm8)</span>
-<span id="L119" class="LineNr">119 </span><span class="Special">% Reg[EBX].i = 13;</span>
-<span id="L120" class="LineNr">120 </span>== <span class="Constant">0x1</span>
-<span id="L121" class="LineNr">121 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L122" class="LineNr">122 </span>  c1  e3                          <span class="PreProc">0</span><span class="Constant">1</span>          <span class="Comment"># negate EBX</span>
-<span id="L123" class="LineNr">123 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 100 (subop shift left) 011 (dest EBX)</span>
-<span id="L124" class="LineNr">124 </span><span class="traceContains">+run: operate on r/m32</span>
-<span id="L125" class="LineNr">125 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L126" class="LineNr">126 </span><span class="traceContains">+run: subop: shift left by CL bits</span>
-<span id="L127" class="LineNr">127 </span><span class="traceContains">+run: storing 0x0000001a</span>
-<span id="L128" class="LineNr">128 </span>
-<span id="L129" class="LineNr">129 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L130" class="LineNr">130 </span><span class="Normal">case</span> <span class="Constant">0xc1</span>: <span class="Delimiter">{</span>
-<span id="L131" class="LineNr">131 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L132" class="LineNr">132 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;operate on r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L133" class="LineNr">133 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L134" class="LineNr">134 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
-<span id="L135" class="LineNr">135 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L136" class="LineNr">136 </span>  <span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>  <span class="Comment">// shift left r/m32 by CL</span>
-<span id="L137" class="LineNr">137 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: shift left by CL bits&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L138" class="LineNr">138 </span>    <span class="Normal">uint8_t</span> count = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">()</span> &amp; <span class="Constant">0x1f</span><span class="Delimiter">;</span>
-<span id="L139" class="LineNr">139 </span>    <span class="Comment">// OF is only defined if count is 1</span>
-<span id="L140" class="LineNr">140 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>count == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L141" class="LineNr">141 </span>      <span class="Normal">bool</span> msb = <span class="Delimiter">(</span>*arg1 &amp; <span class="Constant">0x80000000</span><span class="Delimiter">)</span> &gt;&gt; <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L142" class="LineNr">142 </span>      <span class="Normal">bool</span> pnsb = <span class="Delimiter">(</span>*arg1 &amp; <span class="Constant">0x40000000</span><span class="Delimiter">);</span>
-<span id="L143" class="LineNr">143 </span>      <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>msb != pnsb<span class="Delimiter">);</span>
-<span id="L144" class="LineNr">144 </span>    <span class="Delimiter">}</span>
-<span id="L145" class="LineNr">145 </span>    *arg1 = <span class="Delimiter">(</span>*arg1 &lt;&lt; count<span class="Delimiter">);</span>
-<span id="L146" class="LineNr">146 </span>    ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L147" class="LineNr">147 </span>    SF = <span class="Delimiter">(</span>*arg1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L148" class="LineNr">148 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L433'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L149" class="LineNr">149 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L150" class="LineNr">150 </span>  <span class="Delimiter">}</span>
-<span id="L151" class="LineNr">151 </span>  <span class="Comment">// End Op c1 Subops</span>
-<span id="L152" class="LineNr">152 </span>  <span class="Normal">default</span>:
-<span id="L153" class="LineNr">153 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized subop for opcode c1: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L154" class="LineNr">154 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L155" class="LineNr">155 </span>  <span class="Delimiter">}</span>
-<span id="L156" class="LineNr">156 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L157" class="LineNr">157 </span><span class="Delimiter">}</span>
-<span id="L158" class="LineNr">158 </span>
-<span id="L159" class="LineNr">159 </span><span class="SalientComment">//:: shift right arithmetic</span>
-<span id="L160" class="LineNr">160 </span>
-<span id="L161" class="LineNr">161 </span><span class="Delimiter">:(scenario shift_right_arithmetic_r32_with_imm8)</span>
-<span id="L162" class="LineNr">162 </span><span class="Special">% Reg[EBX].i = 26;</span>
-<span id="L163" class="LineNr">163 </span>== <span class="Constant">0x1</span>
-<span id="L164" class="LineNr">164 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L165" class="LineNr">165 </span>  c1  fb                          <span class="PreProc">0</span><span class="Constant">1</span>          <span class="Comment"># negate EBX</span>
-<span id="L166" class="LineNr">166 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (subop shift right arithmetic) 011 (dest EBX)</span>
-<span id="L167" class="LineNr">167 </span><span class="traceContains">+run: operate on r/m32</span>
-<span id="L168" class="LineNr">168 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L169" class="LineNr">169 </span><span class="traceContains">+run: subop: shift right by CL bits, while preserving sign</span>
-<span id="L170" class="LineNr">170 </span><span class="traceContains">+run: storing 0x0000000d</span>
-<span id="L171" class="LineNr">171 </span>
-<span id="L172" class="LineNr">172 </span><span class="Delimiter">:(before &quot;End Op c1 Subops&quot;)</span>
-<span id="L173" class="LineNr">173 </span><span class="Normal">case</span> <span class="Constant">7</span>: <span class="Delimiter">{</span>  <span class="Comment">// shift right r/m32 by CL, preserving sign</span>
-<span id="L174" class="LineNr">174 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: shift right by CL bits, while preserving sign&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L175" class="LineNr">175 </span>  <span class="Normal">uint8_t</span> count = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">()</span> &amp; <span class="Constant">0x1f</span><span class="Delimiter">;</span>
-<span id="L176" class="LineNr">176 </span>  *arg1 = <span class="Delimiter">(</span>*arg1 &gt;&gt; count<span class="Delimiter">);</span>
-<span id="L177" class="LineNr">177 </span>  ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L178" class="LineNr">178 </span>  SF = <span class="Delimiter">(</span>*arg1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L179" class="LineNr">179 </span>  <span class="Comment">// OF is only defined if count is 1</span>
-<span id="L180" class="LineNr">180 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>count == <span class="Constant">1</span><span class="Delimiter">)</span> <a href='010---vm.cc.html#L81'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L181" class="LineNr">181 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L433'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L182" class="LineNr">182 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L183" class="LineNr">183 </span><span class="Delimiter">}</span>
-<span id="L184" class="LineNr">184 </span>
-<span id="L185" class="LineNr">185 </span><span class="Delimiter">:(scenario shift_right_arithmetic_odd_r32_with_imm8)</span>
-<span id="L186" class="LineNr">186 </span><span class="Special">% Reg[EBX].i = 27;</span>
-<span id="L187" class="LineNr">187 </span>== <span class="Constant">0x1</span>
-<span id="L188" class="LineNr">188 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L189" class="LineNr">189 </span>  c1  fb                          <span class="PreProc">0</span><span class="Constant">1</span>          <span class="Comment"># negate EBX</span>
-<span id="L190" class="LineNr">190 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (subop shift right arithmetic) 011 (dest EBX)</span>
-<span id="L191" class="LineNr">191 </span><span class="traceContains">+run: operate on r/m32</span>
-<span id="L192" class="LineNr">192 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L193" class="LineNr">193 </span><span class="traceContains">+run: subop: shift right by CL bits, while preserving sign</span>
-<span id="L194" class="LineNr">194 </span><span class="Comment"># result: 13</span>
-<span id="L195" class="LineNr">195 </span><span class="traceContains">+run: storing 0x0000000d</span>
+<span id="L6" class="LineNr">  6 </span><span class="Delimiter">:(code)</span>
+<span id="L7" class="LineNr">  7 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L7'>test_add_imm32_to_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L8" class="LineNr">  8 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L9" class="LineNr">  9 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L10" class="LineNr"> 10 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L11" class="LineNr"> 11 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L12" class="LineNr"> 12 </span>      <span class="Constant">&quot;  81     c3                          0a 0b 0c 0d\n&quot;</span>  <span class="Comment">// add 0x0d0c0b0a to EBX</span>
+<span id="L13" class="LineNr"> 13 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 000 (add imm32) 011 (dest EBX)</span>
+<span id="L14" class="LineNr"> 14 </span>  <span class="Delimiter">);</span>
+<span id="L15" class="LineNr"> 15 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L16" class="LineNr"> 16 </span>      <span class="Constant">&quot;run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32\n&quot;</span>
+<span id="L17" class="LineNr"> 17 </span>      <span class="Constant">&quot;run: r/m32 is EBX\n&quot;</span>
+<span id="L18" class="LineNr"> 18 </span>      <span class="Constant">&quot;run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a\n&quot;</span>
+<span id="L19" class="LineNr"> 19 </span>      <span class="Constant">&quot;run: subop add\n&quot;</span>
+<span id="L20" class="LineNr"> 20 </span>      <span class="Constant">&quot;run: storing 0x0d0c0b0b\n&quot;</span>
+<span id="L21" class="LineNr"> 21 </span>  <span class="Delimiter">);</span>
+<span id="L22" class="LineNr"> 22 </span><span class="Delimiter">}</span>
+<span id="L23" class="LineNr"> 23 </span>
+<span id="L24" class="LineNr"> 24 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L25" class="LineNr"> 25 </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="L26" class="LineNr"> 26 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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='037heap.cc.html#L23'>imm32</a> with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L27" class="LineNr"> 27 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
+<span id="L28" class="LineNr"> 28 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L38'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L29" class="LineNr"> 29 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L366'>next32</a><span class="Delimiter">();</span>
+<span id="L30" class="LineNr"> 30 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;imm32 is 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L31" class="LineNr"> 31 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
+<span id="L32" class="LineNr"> 32 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L33" class="LineNr"> 33 </span>  <span class="Normal">case</span> <span class="Constant">0</span>:
+<span id="L34" class="LineNr"> 34 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; end<span class="Delimiter">();</span>
+<span id="L35" class="LineNr"> 35 </span>    <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L36" class="LineNr"> 36 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L37" class="LineNr"> 37 </span>  <span class="Comment">// End Op 81 Subops</span>
+<span id="L38" class="LineNr"> 38 </span>  <span class="Normal">default</span>:
+<span id="L39" class="LineNr"> 39 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized subop for opcode 81: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L40" class="LineNr"> 40 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L41" class="LineNr"> 41 </span>  <span class="Delimiter">}</span>
+<span id="L42" class="LineNr"> 42 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L43" class="LineNr"> 43 </span><span class="Delimiter">}</span>
+<span id="L44" class="LineNr"> 44 </span>
+<span id="L45" class="LineNr"> 45 </span><span class="Comment">//:</span>
+<span id="L46" class="LineNr"> 46 </span>
+<span id="L47" class="LineNr"> 47 </span><span class="Delimiter">:(code)</span>
+<span id="L48" class="LineNr"> 48 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L48'>test_add_imm32_to_mem_at_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L49" class="LineNr"> 49 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L50" class="LineNr"> 50 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L51" class="LineNr"> 51 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L52" class="LineNr"> 52 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L53" class="LineNr"> 53 </span>      <span class="Constant">&quot;  81     03                          0a 0b 0c 0d \n&quot;</span>  <span class="Comment">// add 0x0d0c0b0a to *EBX</span>
+<span id="L54" class="LineNr"> 54 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 000 (add imm32) 011 (dest EBX)</span>
+<span id="L55" class="LineNr"> 55 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L56" class="LineNr"> 56 </span>      <span class="Constant">&quot;01 00 00 00\n&quot;</span>  <span class="Comment">// 0x00000001</span>
+<span id="L57" class="LineNr"> 57 </span>  <span class="Delimiter">);</span>
+<span id="L58" class="LineNr"> 58 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L59" class="LineNr"> 59 </span>      <span class="Constant">&quot;run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32\n&quot;</span>
+<span id="L60" class="LineNr"> 60 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EBX)\n&quot;</span>
+<span id="L61" class="LineNr"> 61 </span>      <span class="Constant">&quot;run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a\n&quot;</span>
+<span id="L62" class="LineNr"> 62 </span>      <span class="Constant">&quot;run: subop add\n&quot;</span>
+<span id="L63" class="LineNr"> 63 </span>      <span class="Constant">&quot;run: storing 0x0d0c0b0b\n&quot;</span>
+<span id="L64" class="LineNr"> 64 </span>  <span class="Delimiter">);</span>
+<span id="L65" class="LineNr"> 65 </span><span class="Delimiter">}</span>
+<span id="L66" class="LineNr"> 66 </span>
+<span id="L67" class="LineNr"> 67 </span><span class="SalientComment">//:: subtract</span>
+<span id="L68" class="LineNr"> 68 </span>
+<span id="L69" class="LineNr"> 69 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L70" class="LineNr"> 70 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;2d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract <a href='037heap.cc.html#L23'>imm32</a> from <a href='010---vm.cc.html#L13'>EAX</a> (sub)&quot;</span><span class="Delimiter">);</span>
+<span id="L71" class="LineNr"> 71 </span>
+<span id="L72" class="LineNr"> 72 </span><span class="Delimiter">:(code)</span>
+<span id="L73" class="LineNr"> 73 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L73'>test_subtract_imm32_from_eax</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L74" class="LineNr"> 74 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x0d0c0baa</span><span class="Delimiter">;</span>
+<span id="L75" class="LineNr"> 75 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L76" class="LineNr"> 76 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L77" class="LineNr"> 77 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L78" class="LineNr"> 78 </span>      <span class="Constant">&quot;  2d                                 0a 0b 0c 0d \n&quot;</span>  <span class="Comment">// subtract 0x0d0c0b0a from EAX</span>
+<span id="L79" class="LineNr"> 79 </span>  <span class="Delimiter">);</span>
+<span id="L80" class="LineNr"> 80 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L81" class="LineNr"> 81 </span>      <span class="Constant">&quot;run: subtract <a href='037heap.cc.html#L23'>imm32</a> 0x0d0c0b0a from EAX\n&quot;</span>
+<span id="L82" class="LineNr"> 82 </span>      <span class="Constant">&quot;run: storing 0x000000a0\n&quot;</span>
+<span id="L83" class="LineNr"> 83 </span>  <span class="Delimiter">);</span>
+<span id="L84" class="LineNr"> 84 </span><span class="Delimiter">}</span>
+<span id="L85" class="LineNr"> 85 </span>
+<span id="L86" class="LineNr"> 86 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L87" class="LineNr"> 87 </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="L88" class="LineNr"> 88 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L366'>next32</a><span class="Delimiter">();</span>
+<span id="L89" class="LineNr"> 89 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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='037heap.cc.html#L23'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; from EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L90" class="LineNr"> 90 </span>  <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L91" class="LineNr"> 91 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L92" class="LineNr"> 92 </span><span class="Delimiter">}</span>
+<span id="L93" class="LineNr"> 93 </span>
+<span id="L94" class="LineNr"> 94 </span><span class="Comment">//:</span>
+<span id="L95" class="LineNr"> 95 </span>
+<span id="L96" class="LineNr"> 96 </span><span class="Delimiter">:(code)</span>
+<span id="L97" class="LineNr"> 97 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L97'>test_subtract_imm32_from_mem_at_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L98" class="LineNr"> 98 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L99" class="LineNr"> 99 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L100" class="LineNr">100 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L101" class="LineNr">101 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L102" class="LineNr">102 </span>      <span class="Constant">&quot;  81     2b                          01 00 00 00 \n&quot;</span>  <span class="Comment">// subtract 1 from *EBX</span>
+<span id="L103" class="LineNr">103 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 101 (subtract imm32) 011 (dest EBX)</span>
+<span id="L104" class="LineNr">104 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L105" class="LineNr">105 </span>      <span class="Constant">&quot;0a 00 00 00\n&quot;</span>  <span class="Comment">// 0x0000000a</span>
+<span id="L106" class="LineNr">106 </span>  <span class="Delimiter">);</span>
+<span id="L107" class="LineNr">107 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L108" class="LineNr">108 </span>      <span class="Constant">&quot;run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32\n&quot;</span>
+<span id="L109" class="LineNr">109 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EBX)\n&quot;</span>
+<span id="L110" class="LineNr">110 </span>      <span class="Constant">&quot;run: <a href='037heap.cc.html#L23'>imm32</a> is 0x00000001\n&quot;</span>
+<span id="L111" class="LineNr">111 </span>      <span class="Constant">&quot;run: subop subtract\n&quot;</span>
+<span id="L112" class="LineNr">112 </span>      <span class="Constant">&quot;run: storing 0x00000009\n&quot;</span>
+<span id="L113" class="LineNr">113 </span>  <span class="Delimiter">);</span>
+<span id="L114" class="LineNr">114 </span><span class="Delimiter">}</span>
+<span id="L115" class="LineNr">115 </span>
+<span id="L116" class="LineNr">116 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
+<span id="L117" class="LineNr">117 </span><span class="Normal">case</span> <span class="Constant">5</span>: <span class="Delimiter">{</span>
+<span id="L118" class="LineNr">118 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop subtract&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L119" class="LineNr">119 </span>  <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L120" class="LineNr">120 </span>  <span class="Identifier">break</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="Comment">//:</span>
+<span id="L124" class="LineNr">124 </span>
+<span id="L125" class="LineNr">125 </span><span class="Delimiter">:(code)</span>
+<span id="L126" class="LineNr">126 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L126'>test_subtract_imm32_from_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L127" class="LineNr">127 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">10</span><span class="Delimiter">;</span>
+<span id="L128" class="LineNr">128 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L129" class="LineNr">129 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L130" class="LineNr">130 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L131" class="LineNr">131 </span>      <span class="Constant">&quot;  81     eb                          01 00 00 00 \n&quot;</span>  <span class="Comment">// subtract 1 from EBX</span>
+<span id="L132" class="LineNr">132 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 101 (subtract imm32) 011 (dest EBX)</span>
+<span id="L133" class="LineNr">133 </span>  <span class="Delimiter">);</span>
+<span id="L134" class="LineNr">134 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L135" class="LineNr">135 </span>      <span class="Constant">&quot;run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32\n&quot;</span>
+<span id="L136" class="LineNr">136 </span>      <span class="Constant">&quot;run: r/m32 is EBX\n&quot;</span>
+<span id="L137" class="LineNr">137 </span>      <span class="Constant">&quot;run: <a href='037heap.cc.html#L23'>imm32</a> is 0x00000001\n&quot;</span>
+<span id="L138" class="LineNr">138 </span>      <span class="Constant">&quot;run: subop subtract\n&quot;</span>
+<span id="L139" class="LineNr">139 </span>      <span class="Constant">&quot;run: storing 0x00000009\n&quot;</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>
+<span id="L143" class="LineNr">143 </span><span class="SalientComment">//:: shift left</span>
+<span id="L144" class="LineNr">144 </span>
+<span id="L145" class="LineNr">145 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L146" class="LineNr">146 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c1&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;shift rm32 by imm8 bits depending on subop (sal/sar/shl/shr)&quot;</span><span class="Delimiter">);</span>
+<span id="L147" class="LineNr">147 </span>
+<span id="L148" class="LineNr">148 </span><span class="Delimiter">:(code)</span>
+<span id="L149" class="LineNr">149 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L149'>test_shift_left_r32_with_imm8</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L150" class="LineNr">150 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">13</span><span class="Delimiter">;</span>
+<span id="L151" class="LineNr">151 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L152" class="LineNr">152 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L153" class="LineNr">153 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L154" class="LineNr">154 </span>      <span class="Constant">&quot;  c1     e3                          01          \n&quot;</span>  <span class="Comment">// shift EBX left by 1 bit</span>
+<span id="L155" class="LineNr">155 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 100 (subop shift left) 011 (dest EBX)</span>
+<span id="L156" class="LineNr">156 </span>  <span class="Delimiter">);</span>
+<span id="L157" class="LineNr">157 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L158" class="LineNr">158 </span>      <span class="Constant">&quot;run: operate on r/m32\n&quot;</span>
+<span id="L159" class="LineNr">159 </span>      <span class="Constant">&quot;run: r/m32 is EBX\n&quot;</span>
+<span id="L160" class="LineNr">160 </span>      <span class="Constant">&quot;run: subop: shift left by CL bits\n&quot;</span>
+<span id="L161" class="LineNr">161 </span>      <span class="Constant">&quot;run: storing 0x0000001a\n&quot;</span>
+<span id="L162" class="LineNr">162 </span>  <span class="Delimiter">);</span>
+<span id="L163" class="LineNr">163 </span><span class="Delimiter">}</span>
+<span id="L164" class="LineNr">164 </span>
+<span id="L165" class="LineNr">165 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L166" class="LineNr">166 </span><span class="Normal">case</span> <span class="Constant">0xc1</span>: <span class="Delimiter">{</span>
+<span id="L167" class="LineNr">167 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
+<span id="L168" class="LineNr">168 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;operate on r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L169" class="LineNr">169 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L38'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L170" class="LineNr">170 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
+<span id="L171" class="LineNr">171 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L172" class="LineNr">172 </span>  <span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>  <span class="Comment">// shift left r/m32 by CL</span>
+<span id="L173" class="LineNr">173 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: shift left by CL bits&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L174" class="LineNr">174 </span>    <span class="Normal">uint8_t</span> count = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">()</span> &amp; <span class="Constant">0x1f</span><span class="Delimiter">;</span>
+<span id="L175" class="LineNr">175 </span>    <span class="Comment">// OF is only defined if count is 1</span>
+<span id="L176" class="LineNr">176 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>count == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L177" class="LineNr">177 </span>      <span class="Normal">bool</span> msb = <span class="Delimiter">(</span>*arg1 &amp; <span class="Constant">0x80000000</span><span class="Delimiter">)</span> &gt;&gt; <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L178" class="LineNr">178 </span>      <span class="Normal">bool</span> pnsb = <span class="Delimiter">(</span>*arg1 &amp; <span class="Constant">0x40000000</span><span class="Delimiter">);</span>
+<span id="L179" class="LineNr">179 </span>      <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>msb != pnsb<span class="Delimiter">);</span>
+<span id="L180" class="LineNr">180 </span>    <span class="Delimiter">}</span>
+<span id="L181" class="LineNr">181 </span>    *arg1 = <span class="Delimiter">(</span>*arg1 &lt;&lt; count<span class="Delimiter">);</span>
+<span id="L182" class="LineNr">182 </span>    <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L183" class="LineNr">183 </span>    SF = <span class="Delimiter">(</span>*arg1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L184" class="LineNr">184 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L440'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L185" class="LineNr">185 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L186" class="LineNr">186 </span>  <span class="Delimiter">}</span>
+<span id="L187" class="LineNr">187 </span>  <span class="Comment">// End Op c1 Subops</span>
+<span id="L188" class="LineNr">188 </span>  <span class="Normal">default</span>:
+<span id="L189" class="LineNr">189 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized subop for opcode c1: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L190" class="LineNr">190 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L191" class="LineNr">191 </span>  <span class="Delimiter">}</span>
+<span id="L192" class="LineNr">192 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L193" class="LineNr">193 </span><span class="Delimiter">}</span>
+<span id="L194" class="LineNr">194 </span>
+<span id="L195" class="LineNr">195 </span><span class="SalientComment">//:: shift right arithmetic</span>
 <span id="L196" class="LineNr">196 </span>
-<span id="L197" class="LineNr">197 </span><span class="Delimiter">:(scenario shift_right_arithmetic_negative_r32_with_imm8)</span>
-<span id="L198" class="LineNr">198 </span><span class="Special">% Reg[EBX].i = 0xfffffffd;  // -3</span>
-<span id="L199" class="LineNr">199 </span>== <span class="Constant">0x1</span>
-<span id="L200" class="LineNr">200 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L201" class="LineNr">201 </span>  c1  fb                          <span class="PreProc">0</span><span class="Constant">1</span>          <span class="Comment"># negate EBX</span>
-<span id="L202" class="LineNr">202 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (subop shift right arithmetic) 011 (dest EBX)</span>
-<span id="L203" class="LineNr">203 </span><span class="traceContains">+run: operate on r/m32</span>
-<span id="L204" class="LineNr">204 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L205" class="LineNr">205 </span><span class="traceContains">+run: subop: shift right by CL bits, while preserving sign</span>
-<span id="L206" class="LineNr">206 </span><span class="Comment"># result: -2</span>
-<span id="L207" class="LineNr">207 </span><span class="traceContains">+run: storing 0xfffffffe</span>
-<span id="L208" class="LineNr">208 </span>
-<span id="L209" class="LineNr">209 </span><span class="SalientComment">//:: shift right logical</span>
-<span id="L210" class="LineNr">210 </span>
-<span id="L211" class="LineNr">211 </span><span class="Delimiter">:(scenario shift_right_logical_r32_with_imm8)</span>
-<span id="L212" class="LineNr">212 </span><span class="Special">% Reg[EBX].i = 26;</span>
-<span id="L213" class="LineNr">213 </span>== <span class="Constant">0x1</span>
-<span id="L214" class="LineNr">214 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L215" class="LineNr">215 </span>  c1  eb                          <span class="PreProc">0</span><span class="Constant">1</span>          <span class="Comment"># negate EBX</span>
-<span id="L216" class="LineNr">216 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 101 (subop shift right logical) 011 (dest EBX)</span>
-<span id="L217" class="LineNr">217 </span><span class="traceContains">+run: operate on r/m32</span>
-<span id="L218" class="LineNr">218 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L219" class="LineNr">219 </span><span class="traceContains">+run: subop: shift right by CL bits, while padding zeroes</span>
-<span id="L220" class="LineNr">220 </span><span class="traceContains">+run: storing 0x0000000d</span>
-<span id="L221" class="LineNr">221 </span>
-<span id="L222" class="LineNr">222 </span><span class="Delimiter">:(before &quot;End Op c1 Subops&quot;)</span>
-<span id="L223" class="LineNr">223 </span><span class="Normal">case</span> <span class="Constant">5</span>: <span class="Delimiter">{</span>  <span class="Comment">// shift right r/m32 by CL, preserving sign</span>
-<span id="L224" class="LineNr">224 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: shift right by CL bits, while padding zeroes&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L225" class="LineNr">225 </span>  <span class="Normal">uint8_t</span> count = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">()</span> &amp; <span class="Constant">0x1f</span><span class="Delimiter">;</span>
-<span id="L226" class="LineNr">226 </span>  <span class="Comment">// OF is only defined if count is 1</span>
-<span id="L227" class="LineNr">227 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>count == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L228" class="LineNr">228 </span>    <span class="Normal">bool</span> msb = <span class="Delimiter">(</span>*arg1 &amp; <span class="Constant">0x80000000</span><span class="Delimiter">)</span> &gt;&gt; <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L229" class="LineNr">229 </span>    <span class="Normal">bool</span> pnsb = <span class="Delimiter">(</span>*arg1 &amp; <span class="Constant">0x40000000</span><span class="Delimiter">);</span>
-<span id="L230" class="LineNr">230 </span>    <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>msb != pnsb<span class="Delimiter">);</span>
-<span id="L231" class="LineNr">231 </span>  <span class="Delimiter">}</span>
-<span id="L232" class="LineNr">232 </span>  <span class="Normal">uint32_t</span>* uarg1 = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint32_t</span>*&gt;<span class="Delimiter">(</span>arg1<span class="Delimiter">);</span>
-<span id="L233" class="LineNr">233 </span>  *uarg1 = <span class="Delimiter">(</span>*uarg1 &gt;&gt; count<span class="Delimiter">);</span>
-<span id="L234" class="LineNr">234 </span>  ZF = <span class="Delimiter">(</span>*uarg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L235" class="LineNr">235 </span>  <span class="Comment">// result is always positive by definition</span>
-<span id="L236" class="LineNr">236 </span>  SF =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L237" class="LineNr">237 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L433'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L238" class="LineNr">238 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L239" class="LineNr">239 </span><span class="Delimiter">}</span>
-<span id="L240" class="LineNr">240 </span>
-<span id="L241" class="LineNr">241 </span><span class="Delimiter">:(scenario shift_right_logical_odd_r32_with_imm8)</span>
-<span id="L242" class="LineNr">242 </span><span class="Special">% Reg[EBX].i = 27;</span>
-<span id="L243" class="LineNr">243 </span>== <span class="Constant">0x1</span>
-<span id="L244" class="LineNr">244 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L245" class="LineNr">245 </span>  c1  eb                          <span class="PreProc">0</span><span class="Constant">1</span>          <span class="Comment"># negate EBX</span>
-<span id="L246" class="LineNr">246 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 101 (subop shift right logical) 011 (dest EBX)</span>
-<span id="L247" class="LineNr">247 </span><span class="traceContains">+run: operate on r/m32</span>
-<span id="L248" class="LineNr">248 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L249" class="LineNr">249 </span><span class="traceContains">+run: subop: shift right by CL bits, while padding zeroes</span>
-<span id="L250" class="LineNr">250 </span><span class="Comment"># result: 13</span>
-<span id="L251" class="LineNr">251 </span><span class="traceContains">+run: storing 0x0000000d</span>
-<span id="L252" class="LineNr">252 </span>
-<span id="L253" class="LineNr">253 </span><span class="Delimiter">:(scenario shift_right_logical_negative_r32_with_imm8)</span>
-<span id="L254" class="LineNr">254 </span><span class="Special">% Reg[EBX].i = 0xfffffffd;</span>
-<span id="L255" class="LineNr">255 </span>== <span class="Constant">0x1</span>
-<span id="L256" class="LineNr">256 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L257" class="LineNr">257 </span>  c1  eb                          <span class="PreProc">0</span><span class="Constant">1</span>          <span class="Comment"># negate EBX</span>
-<span id="L258" class="LineNr">258 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 101 (subop shift right logical) 011 (dest EBX)</span>
-<span id="L259" class="LineNr">259 </span><span class="traceContains">+run: operate on r/m32</span>
-<span id="L260" class="LineNr">260 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L261" class="LineNr">261 </span><span class="traceContains">+run: subop: shift right by CL bits, while padding zeroes</span>
-<span id="L262" class="LineNr">262 </span><span class="traceContains">+run: storing 0x7ffffffe</span>
-<span id="L263" class="LineNr">263 </span>
-<span id="L264" class="LineNr">264 </span><span class="SalientComment">//:: and</span>
-<span id="L265" class="LineNr">265 </span>
-<span id="L266" class="LineNr">266 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L267" class="LineNr">267 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;25&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;EAX = bitwise AND of <a href='037heap.cc.html#L23'>imm32</a> with <a href='010---vm.cc.html#L13'>EAX</a> (and)&quot;</span><span class="Delimiter">);</span>
-<span id="L268" class="LineNr">268 </span>
-<span id="L269" class="LineNr">269 </span><span class="Delimiter">:(scenario and_imm32_with_eax)</span>
-<span id="L270" class="LineNr">270 </span><span class="Special">% Reg[EAX].i = 0xff;</span>
-<span id="L271" class="LineNr">271 </span>== <span class="Constant">0x1</span>
-<span id="L272" class="LineNr">272 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L273" class="LineNr">273 </span>  <span class="Constant">25</span>                              0a 0b 0c 0d  <span class="Comment"># and 0x0d0c0b0a with EAX</span>
-<span id="L274" class="LineNr">274 </span><span class="traceContains">+run: and <a href='037heap.cc.html#L23'>imm32</a> 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L275" class="LineNr">275 </span><span class="traceContains">+run: storing 0x0000000a</span>
-<span id="L276" class="LineNr">276 </span>
-<span id="L277" class="LineNr">277 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L278" class="LineNr">278 </span><span class="Normal">case</span> <span class="Constant">0x25</span>: <span class="Delimiter">{</span>  <span class="Comment">// and imm32 with EAX</span>
-<span id="L279" class="LineNr">279 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L336'>next32</a><span class="Delimiter">();</span>
-<span id="L280" class="LineNr">280 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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='037heap.cc.html#L23'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L281" class="LineNr">281 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L282" class="LineNr">282 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L283" class="LineNr">283 </span><span class="Delimiter">}</span>
-<span id="L284" class="LineNr">284 </span>
-<span id="L285" class="LineNr">285 </span><span class="Comment">//:</span>
-<span id="L286" class="LineNr">286 </span>
-<span id="L287" class="LineNr">287 </span><span class="Delimiter">:(scenario and_imm32_with_mem_at_r32)</span>
-<span id="L288" class="LineNr">288 </span><span class="Special">% Reg[EBX].i = 0x2000;</span>
-<span id="L289" class="LineNr">289 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
-<span id="L290" class="LineNr">290 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L291" class="LineNr">291 </span>  <span class="Constant">81</span>  <span class="Constant">23</span>                          0a 0b 0c 0d  <span class="Comment"># and 0x0d0c0b0a with *EBX</span>
-<span id="L292" class="LineNr">292 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 100 (and imm32) 011 (dest EBX)</span>
-<span id="L293" class="LineNr">293 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L294" class="LineNr">294 </span>ff <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># 0xff</span>
-<span id="L295" class="LineNr">295 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
-<span id="L296" class="LineNr">296 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
-<span id="L297" class="LineNr">297 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a</span>
-<span id="L298" class="LineNr">298 </span><span class="traceContains">+run: subop and</span>
-<span id="L299" class="LineNr">299 </span><span class="traceContains">+run: storing 0x0000000a</span>
+<span id="L197" class="LineNr">197 </span><span class="Delimiter">:(code)</span>
+<span id="L198" class="LineNr">198 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L198'>test_shift_right_arithmetic_r32_with_imm8</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L199" class="LineNr">199 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">26</span><span class="Delimiter">;</span>
+<span id="L200" class="LineNr">200 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L201" class="LineNr">201 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L202" class="LineNr">202 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L203" class="LineNr">203 </span>      <span class="Constant">&quot;  c1     fb                          01          \n&quot;</span>  <span class="Comment">// shift EBX right by 1 bit</span>
+<span id="L204" class="LineNr">204 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 111 (subop shift right arithmetic) 011 (dest EBX)</span>
+<span id="L205" class="LineNr">205 </span>  <span class="Delimiter">);</span>
+<span id="L206" class="LineNr">206 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L207" class="LineNr">207 </span>      <span class="Constant">&quot;run: operate on r/m32\n&quot;</span>
+<span id="L208" class="LineNr">208 </span>      <span class="Constant">&quot;run: r/m32 is EBX\n&quot;</span>
+<span id="L209" class="LineNr">209 </span>      <span class="Constant">&quot;run: subop: shift right by CL bits, while preserving sign\n&quot;</span>
+<span id="L210" class="LineNr">210 </span>      <span class="Constant">&quot;run: storing 0x0000000d\n&quot;</span>
+<span id="L211" class="LineNr">211 </span>  <span class="Delimiter">);</span>
+<span id="L212" class="LineNr">212 </span><span class="Delimiter">}</span>
+<span id="L213" class="LineNr">213 </span>
+<span id="L214" class="LineNr">214 </span><span class="Delimiter">:(before &quot;End Op c1 Subops&quot;)</span>
+<span id="L215" class="LineNr">215 </span><span class="Normal">case</span> <span class="Constant">7</span>: <span class="Delimiter">{</span>  <span class="Comment">// shift right r/m32 by CL, preserving sign</span>
+<span id="L216" class="LineNr">216 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: shift right by CL bits, while preserving sign&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L217" class="LineNr">217 </span>  <span class="Normal">uint8_t</span> count = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">()</span> &amp; <span class="Constant">0x1f</span><span class="Delimiter">;</span>
+<span id="L218" class="LineNr">218 </span>  *arg1 = <span class="Delimiter">(</span>*arg1 &gt;&gt; count<span class="Delimiter">);</span>
+<span id="L219" class="LineNr">219 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L220" class="LineNr">220 </span>  SF = <span class="Delimiter">(</span>*arg1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L221" class="LineNr">221 </span>  <span class="Comment">// OF is only defined if count is 1</span>
+<span id="L222" class="LineNr">222 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>count == <span class="Constant">1</span><span class="Delimiter">)</span> <a href='010---vm.cc.html#L81'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L223" class="LineNr">223 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L440'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L224" class="LineNr">224 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L225" class="LineNr">225 </span><span class="Delimiter">}</span>
+<span id="L226" class="LineNr">226 </span>
+<span id="L227" class="LineNr">227 </span><span class="Delimiter">:(code)</span>
+<span id="L228" class="LineNr">228 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L228'>test_shift_right_arithmetic_odd_r32_with_imm8</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L229" class="LineNr">229 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">27</span><span class="Delimiter">;</span>
+<span id="L230" class="LineNr">230 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L231" class="LineNr">231 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L232" class="LineNr">232 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L233" class="LineNr">233 </span>      <span class="Constant">&quot;  c1     fb                          01          \n&quot;</span>  <span class="Comment">// shift EBX right by 1 bit</span>
+<span id="L234" class="LineNr">234 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 111 (subop shift right arithmetic) 011 (dest EBX)</span>
+<span id="L235" class="LineNr">235 </span>  <span class="Delimiter">);</span>
+<span id="L236" class="LineNr">236 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L237" class="LineNr">237 </span>      <span class="Constant">&quot;run: operate on r/m32\n&quot;</span>
+<span id="L238" class="LineNr">238 </span>      <span class="Constant">&quot;run: r/m32 is EBX\n&quot;</span>
+<span id="L239" class="LineNr">239 </span>      <span class="Constant">&quot;run: subop: shift right by CL bits, while preserving sign\n&quot;</span>
+<span id="L240" class="LineNr">240 </span>      <span class="Comment">// result: 13</span>
+<span id="L241" class="LineNr">241 </span>      <span class="Constant">&quot;run: storing 0x0000000d\n&quot;</span>
+<span id="L242" class="LineNr">242 </span>  <span class="Delimiter">);</span>
+<span id="L243" class="LineNr">243 </span><span class="Delimiter">}</span>
+<span id="L244" class="LineNr">244 </span>
+<span id="L245" class="LineNr">245 </span><span class="Delimiter">:(code)</span>
+<span id="L246" class="LineNr">246 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L246'>test_shift_right_arithmetic_negative_r32_with_imm8</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L247" class="LineNr">247 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0xfffffffd</span><span class="Delimiter">;</span>  <span class="Comment">// -3</span>
+<span id="L248" class="LineNr">248 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L249" class="LineNr">249 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L250" class="LineNr">250 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L251" class="LineNr">251 </span>      <span class="Constant">&quot;  c1     fb                          01          \n&quot;</span>  <span class="Comment">// shift EBX right by 1 bit, while preserving sign</span>
+<span id="L252" class="LineNr">252 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 111 (subop shift right arithmetic) 011 (dest EBX)</span>
+<span id="L253" class="LineNr">253 </span>  <span class="Delimiter">);</span>
+<span id="L254" class="LineNr">254 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L255" class="LineNr">255 </span>      <span class="Constant">&quot;run: operate on r/m32\n&quot;</span>
+<span id="L256" class="LineNr">256 </span>      <span class="Constant">&quot;run: r/m32 is EBX\n&quot;</span>
+<span id="L257" class="LineNr">257 </span>      <span class="Constant">&quot;run: subop: shift right by CL bits, while preserving sign\n&quot;</span>
+<span id="L258" class="LineNr">258 </span>      <span class="Comment">// result: -2</span>
+<span id="L259" class="LineNr">259 </span>      <span class="Constant">&quot;run: storing 0xfffffffe\n&quot;</span>
+<span id="L260" class="LineNr">260 </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="SalientComment">//:: shift right logical</span>
+<span id="L264" class="LineNr">264 </span>
+<span id="L265" class="LineNr">265 </span><span class="Delimiter">:(code)</span>
+<span id="L266" class="LineNr">266 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L266'>test_shift_right_logical_r32_with_imm8</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L267" class="LineNr">267 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">26</span><span class="Delimiter">;</span>
+<span id="L268" class="LineNr">268 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L269" class="LineNr">269 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L270" class="LineNr">270 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L271" class="LineNr">271 </span>      <span class="Constant">&quot;  c1     eb                          01          \n&quot;</span>  <span class="Comment">// shift EBX right by 1 bit, while padding zeroes</span>
+<span id="L272" class="LineNr">272 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 101 (subop shift right logical) 011 (dest EBX)</span>
+<span id="L273" class="LineNr">273 </span>  <span class="Delimiter">);</span>
+<span id="L274" class="LineNr">274 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L275" class="LineNr">275 </span>      <span class="Constant">&quot;run: operate on r/m32\n&quot;</span>
+<span id="L276" class="LineNr">276 </span>      <span class="Constant">&quot;run: r/m32 is EBX\n&quot;</span>
+<span id="L277" class="LineNr">277 </span>      <span class="Constant">&quot;run: subop: shift right by CL bits, while padding zeroes\n&quot;</span>
+<span id="L278" class="LineNr">278 </span>      <span class="Constant">&quot;run: storing 0x0000000d\n&quot;</span>
+<span id="L279" class="LineNr">279 </span>  <span class="Delimiter">);</span>
+<span id="L280" class="LineNr">280 </span><span class="Delimiter">}</span>
+<span id="L281" class="LineNr">281 </span>
+<span id="L282" class="LineNr">282 </span><span class="Delimiter">:(before &quot;End Op c1 Subops&quot;)</span>
+<span id="L283" class="LineNr">283 </span><span class="Normal">case</span> <span class="Constant">5</span>: <span class="Delimiter">{</span>  <span class="Comment">// shift right r/m32 by CL, preserving sign</span>
+<span id="L284" class="LineNr">284 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: shift right by CL bits, while padding zeroes&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L285" class="LineNr">285 </span>  <span class="Normal">uint8_t</span> count = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">()</span> &amp; <span class="Constant">0x1f</span><span class="Delimiter">;</span>
+<span id="L286" class="LineNr">286 </span>  <span class="Comment">// OF is only defined if count is 1</span>
+<span id="L287" class="LineNr">287 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>count == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L288" class="LineNr">288 </span>    <span class="Normal">bool</span> msb = <span class="Delimiter">(</span>*arg1 &amp; <span class="Constant">0x80000000</span><span class="Delimiter">)</span> &gt;&gt; <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L289" class="LineNr">289 </span>    <span class="Normal">bool</span> pnsb = <span class="Delimiter">(</span>*arg1 &amp; <span class="Constant">0x40000000</span><span class="Delimiter">);</span>
+<span id="L290" class="LineNr">290 </span>    <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>msb != pnsb<span class="Delimiter">);</span>
+<span id="L291" class="LineNr">291 </span>  <span class="Delimiter">}</span>
+<span id="L292" class="LineNr">292 </span>  <span class="Normal">uint32_t</span>* uarg1 = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint32_t</span>*&gt;<span class="Delimiter">(</span>arg1<span class="Delimiter">);</span>
+<span id="L293" class="LineNr">293 </span>  *uarg1 = <span class="Delimiter">(</span>*uarg1 &gt;&gt; count<span class="Delimiter">);</span>
+<span id="L294" class="LineNr">294 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Delimiter">(</span>*uarg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L295" class="LineNr">295 </span>  <span class="Comment">// result is always positive by definition</span>
+<span id="L296" class="LineNr">296 </span>  SF = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L297" class="LineNr">297 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L440'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L298" class="LineNr">298 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L299" class="LineNr">299 </span><span class="Delimiter">}</span>
 <span id="L300" class="LineNr">300 </span>
-<span id="L301" class="LineNr">301 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
-<span id="L302" class="LineNr">302 </span><span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>
-<span id="L303" class="LineNr">303 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop and&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L304" class="LineNr">304 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L305" class="LineNr">305 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L306" class="LineNr">306 </span><span class="Delimiter">}</span>
-<span id="L307" class="LineNr">307 </span>
-<span id="L308" class="LineNr">308 </span><span class="Comment">//:</span>
-<span id="L309" class="LineNr">309 </span>
-<span id="L310" class="LineNr">310 </span><span class="Delimiter">:(scenario and_imm32_with_r32)</span>
-<span id="L311" class="LineNr">311 </span><span class="Special">% Reg[EBX].i = 0xff;</span>
-<span id="L312" class="LineNr">312 </span>== <span class="Constant">0x1</span>
-<span id="L313" class="LineNr">313 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L314" class="LineNr">314 </span>  <span class="Constant">81</span>  e3                          0a 0b 0c 0d  <span class="Comment"># and 0x0d0c0b0a with EBX</span>
-<span id="L315" class="LineNr">315 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 100 (and imm32) 011 (dest EBX)</span>
-<span id="L316" class="LineNr">316 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
-<span id="L317" class="LineNr">317 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L318" class="LineNr">318 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a</span>
-<span id="L319" class="LineNr">319 </span><span class="traceContains">+run: subop and</span>
-<span id="L320" class="LineNr">320 </span><span class="traceContains">+run: storing 0x0000000a</span>
-<span id="L321" class="LineNr">321 </span>
-<span id="L322" class="LineNr">322 </span><span class="SalientComment">//:: or</span>
-<span id="L323" class="LineNr">323 </span>
-<span id="L324" class="LineNr">324 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L325" class="LineNr">325 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;0d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;EAX = bitwise OR of <a href='037heap.cc.html#L23'>imm32</a> with <a href='010---vm.cc.html#L13'>EAX</a> (or)&quot;</span><span class="Delimiter">);</span>
-<span id="L326" class="LineNr">326 </span>
-<span id="L327" class="LineNr">327 </span><span class="Delimiter">:(scenario or_imm32_with_eax)</span>
-<span id="L328" class="LineNr">328 </span><span class="Special">% Reg[EAX].i = 0xd0c0b0a0;</span>
-<span id="L329" class="LineNr">329 </span>== <span class="Constant">0x1</span>
-<span id="L330" class="LineNr">330 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L331" class="LineNr">331 </span>  0d                              0a 0b 0c 0d  <span class="Comment"># or 0x0d0c0b0a with EAX</span>
-<span id="L332" class="LineNr">332 </span><span class="traceContains">+run: or <a href='037heap.cc.html#L23'>imm32</a> 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L333" class="LineNr">333 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
+<span id="L301" class="LineNr">301 </span><span class="Delimiter">:(code)</span>
+<span id="L302" class="LineNr">302 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L302'>test_shift_right_logical_odd_r32_with_imm8</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L303" class="LineNr">303 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">27</span><span class="Delimiter">;</span>
+<span id="L304" class="LineNr">304 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L305" class="LineNr">305 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L306" class="LineNr">306 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L307" class="LineNr">307 </span>      <span class="Constant">&quot;  c1     eb                          01          \n&quot;</span>  <span class="Comment">// shift EBX right by 1 bit, while padding zeroes</span>
+<span id="L308" class="LineNr">308 </span>  <span class="Delimiter">);</span>
+<span id="L309" class="LineNr">309 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L310" class="LineNr">310 </span>      <span class="Constant">&quot;run: operate on r/m32\n&quot;</span>
+<span id="L311" class="LineNr">311 </span>      <span class="Constant">&quot;run: r/m32 is EBX\n&quot;</span>
+<span id="L312" class="LineNr">312 </span>      <span class="Constant">&quot;run: subop: shift right by CL bits, while padding zeroes\n&quot;</span>
+<span id="L313" class="LineNr">313 </span>      <span class="Comment">// result: 13</span>
+<span id="L314" class="LineNr">314 </span>      <span class="Constant">&quot;run: storing 0x0000000d\n&quot;</span>
+<span id="L315" class="LineNr">315 </span>  <span class="Delimiter">);</span>
+<span id="L316" class="LineNr">316 </span><span class="Delimiter">}</span>
+<span id="L317" class="LineNr">317 </span>
+<span id="L318" class="LineNr">318 </span><span class="Delimiter">:(code)</span>
+<span id="L319" class="LineNr">319 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L319'>test_shift_right_logical_negative_r32_with_imm8</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L320" class="LineNr">320 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0xfffffffd</span><span class="Delimiter">;</span>
+<span id="L321" class="LineNr">321 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L322" class="LineNr">322 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L323" class="LineNr">323 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L324" class="LineNr">324 </span>      <span class="Constant">&quot;  c1     eb                          01          \n&quot;</span>  <span class="Comment">// shift EBX right by 1 bit, while padding zeroes</span>
+<span id="L325" class="LineNr">325 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 101 (subop shift right logical) 011 (dest EBX)</span>
+<span id="L326" class="LineNr">326 </span>  <span class="Delimiter">);</span>
+<span id="L327" class="LineNr">327 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L328" class="LineNr">328 </span>      <span class="Constant">&quot;run: operate on r/m32\n&quot;</span>
+<span id="L329" class="LineNr">329 </span>      <span class="Constant">&quot;run: r/m32 is EBX\n&quot;</span>
+<span id="L330" class="LineNr">330 </span>      <span class="Constant">&quot;run: subop: shift right by CL bits, while padding zeroes\n&quot;</span>
+<span id="L331" class="LineNr">331 </span>      <span class="Constant">&quot;run: storing 0x7ffffffe\n&quot;</span>
+<span id="L332" class="LineNr">332 </span>  <span class="Delimiter">);</span>
+<span id="L333" class="LineNr">333 </span><span class="Delimiter">}</span>
 <span id="L334" class="LineNr">334 </span>
-<span id="L335" class="LineNr">335 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L336" class="LineNr">336 </span><span class="Normal">case</span> <span class="Constant">0x0d</span>: <span class="Delimiter">{</span>  <span class="Comment">// or imm32 with EAX</span>
-<span id="L337" class="LineNr">337 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L336'>next32</a><span class="Delimiter">();</span>
-<span id="L338" class="LineNr">338 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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='037heap.cc.html#L23'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L339" class="LineNr">339 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L340" class="LineNr">340 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L341" class="LineNr">341 </span><span class="Delimiter">}</span>
-<span id="L342" class="LineNr">342 </span>
-<span id="L343" class="LineNr">343 </span><span class="Comment">//:</span>
-<span id="L344" class="LineNr">344 </span>
-<span id="L345" class="LineNr">345 </span><span class="Delimiter">:(scenario or_imm32_with_mem_at_r32)</span>
-<span id="L346" class="LineNr">346 </span><span class="Special">% Reg[EBX].i = 0x2000;</span>
-<span id="L347" class="LineNr">347 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
-<span id="L348" class="LineNr">348 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L349" class="LineNr">349 </span>  <span class="Constant">81</span>  0b                          0a 0b 0c 0d  <span class="Comment"># or 0x0d0c0b0a with *EBX</span>
-<span id="L350" class="LineNr">350 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 001 (or imm32) 011 (dest EBX)</span>
-<span id="L351" class="LineNr">351 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L352" class="LineNr">352 </span>a0 b0 c0 d0  <span class="Comment"># 0xd0c0b0a0</span>
-<span id="L353" class="LineNr">353 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
-<span id="L354" class="LineNr">354 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
-<span id="L355" class="LineNr">355 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a</span>
-<span id="L356" class="LineNr">356 </span><span class="traceContains">+run: subop or</span>
-<span id="L357" class="LineNr">357 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
-<span id="L358" class="LineNr">358 </span>
-<span id="L359" class="LineNr">359 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
-<span id="L360" class="LineNr">360 </span><span class="Normal">case</span> <span class="Constant">1</span>: <span class="Delimiter">{</span>
-<span id="L361" class="LineNr">361 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop or&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L362" class="LineNr">362 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L363" class="LineNr">363 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L364" class="LineNr">364 </span><span class="Delimiter">}</span>
-<span id="L365" class="LineNr">365 </span>
-<span id="L366" class="LineNr">366 </span><span class="Delimiter">:(scenario or_imm32_with_r32)</span>
-<span id="L367" class="LineNr">367 </span><span class="Special">% Reg[EBX].i = 0xd0c0b0a0;</span>
-<span id="L368" class="LineNr">368 </span>== <span class="Constant">0x1</span>
-<span id="L369" class="LineNr">369 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L370" class="LineNr">370 </span>  <span class="Constant">81</span>  cb                          0a 0b 0c 0d  <span class="Comment"># or 0x0d0c0b0a with EBX</span>
-<span id="L371" class="LineNr">371 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 001 (or imm32) 011 (dest EBX)</span>
-<span id="L372" class="LineNr">372 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
-<span id="L373" class="LineNr">373 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L374" class="LineNr">374 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a</span>
-<span id="L375" class="LineNr">375 </span><span class="traceContains">+run: subop or</span>
-<span id="L376" class="LineNr">376 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
-<span id="L377" class="LineNr">377 </span>
-<span id="L378" class="LineNr">378 </span><span class="SalientComment">//:: xor</span>
-<span id="L379" class="LineNr">379 </span>
-<span id="L380" class="LineNr">380 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L381" class="LineNr">381 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;35&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;EAX = bitwise XOR of <a href='037heap.cc.html#L23'>imm32</a> with <a href='010---vm.cc.html#L13'>EAX</a> (xor)&quot;</span><span class="Delimiter">);</span>
-<span id="L382" class="LineNr">382 </span>
-<span id="L383" class="LineNr">383 </span><span class="Delimiter">:(scenario xor_imm32_with_eax)</span>
-<span id="L384" class="LineNr">384 </span><span class="Special">% Reg[EAX].i = 0xddccb0a0;</span>
-<span id="L385" class="LineNr">385 </span>== <span class="Constant">0x1</span>
-<span id="L386" class="LineNr">386 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L387" class="LineNr">387 </span>  <span class="Constant">35</span>                              0a 0b 0c 0d  <span class="Comment"># xor 0x0d0c0b0a with EAX</span>
-<span id="L388" class="LineNr">388 </span><span class="traceContains">+run: xor <a href='037heap.cc.html#L23'>imm32</a> 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L389" class="LineNr">389 </span><span class="traceContains">+run: storing 0xd0c0bbaa</span>
+<span id="L335" class="LineNr">335 </span><span class="SalientComment">//:: and</span>
+<span id="L336" class="LineNr">336 </span>
+<span id="L337" class="LineNr">337 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L338" class="LineNr">338 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;25&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;EAX = bitwise AND of <a href='037heap.cc.html#L23'>imm32</a> with <a href='010---vm.cc.html#L13'>EAX</a> (and)&quot;</span><span class="Delimiter">);</span>
+<span id="L339" class="LineNr">339 </span>
+<span id="L340" class="LineNr">340 </span><span class="Delimiter">:(code)</span>
+<span id="L341" class="LineNr">341 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L341'>test_and_imm32_with_eax</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L342" class="LineNr">342 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0xff</span><span class="Delimiter">;</span>
+<span id="L343" class="LineNr">343 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L344" class="LineNr">344 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L345" class="LineNr">345 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L346" class="LineNr">346 </span>      <span class="Constant">&quot;  25                                 0a 0b 0c 0d \n&quot;</span>  <span class="Comment">// and 0x0d0c0b0a with EAX</span>
+<span id="L347" class="LineNr">347 </span>  <span class="Delimiter">);</span>
+<span id="L348" class="LineNr">348 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L349" class="LineNr">349 </span>      <span class="Constant">&quot;run: and <a href='037heap.cc.html#L23'>imm32</a> 0x0d0c0b0a with EAX\n&quot;</span>
+<span id="L350" class="LineNr">350 </span>      <span class="Constant">&quot;run: storing 0x0000000a\n&quot;</span>
+<span id="L351" class="LineNr">351 </span>  <span class="Delimiter">);</span>
+<span id="L352" class="LineNr">352 </span><span class="Delimiter">}</span>
+<span id="L353" class="LineNr">353 </span>
+<span id="L354" class="LineNr">354 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L355" class="LineNr">355 </span><span class="Normal">case</span> <span class="Constant">0x25</span>: <span class="Delimiter">{</span>  <span class="Comment">// and imm32 with EAX</span>
+<span id="L356" class="LineNr">356 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L366'>next32</a><span class="Delimiter">();</span>
+<span id="L357" class="LineNr">357 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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='037heap.cc.html#L23'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L358" class="LineNr">358 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L359" class="LineNr">359 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L360" class="LineNr">360 </span><span class="Delimiter">}</span>
+<span id="L361" class="LineNr">361 </span>
+<span id="L362" class="LineNr">362 </span><span class="Comment">//:</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">void</span> <a href='015immediate_addressing.cc.html#L365'>test_and_imm32_with_mem_at_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L366" class="LineNr">366 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L367" class="LineNr">367 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L368" class="LineNr">368 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L369" class="LineNr">369 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L370" class="LineNr">370 </span>      <span class="Constant">&quot;  81     23                          0a 0b 0c 0d \n&quot;</span>  <span class="Comment">// and 0x0d0c0b0a with *EBX</span>
+<span id="L371" class="LineNr">371 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 100 (and imm32) 011 (dest EBX)</span>
+<span id="L372" class="LineNr">372 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L373" class="LineNr">373 </span>      <span class="Constant">&quot;ff 00 00 00\n&quot;</span>  <span class="Comment">// 0x000000ff</span>
+<span id="L374" class="LineNr">374 </span>  <span class="Delimiter">);</span>
+<span id="L375" class="LineNr">375 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L376" class="LineNr">376 </span>      <span class="Constant">&quot;run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32\n&quot;</span>
+<span id="L377" class="LineNr">377 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EBX)\n&quot;</span>
+<span id="L378" class="LineNr">378 </span>      <span class="Constant">&quot;run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a\n&quot;</span>
+<span id="L379" class="LineNr">379 </span>      <span class="Constant">&quot;run: subop and\n&quot;</span>
+<span id="L380" class="LineNr">380 </span>      <span class="Constant">&quot;run: storing 0x0000000a\n&quot;</span>
+<span id="L381" class="LineNr">381 </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="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
+<span id="L385" class="LineNr">385 </span><span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>
+<span id="L386" class="LineNr">386 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop and&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L387" class="LineNr">387 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L388" class="LineNr">388 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L389" class="LineNr">389 </span><span class="Delimiter">}</span>
 <span id="L390" class="LineNr">390 </span>
-<span id="L391" class="LineNr">391 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L392" class="LineNr">392 </span><span class="Normal">case</span> <span class="Constant">0x35</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor imm32 with EAX</span>
-<span id="L393" class="LineNr">393 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L336'>next32</a><span class="Delimiter">();</span>
-<span id="L394" class="LineNr">394 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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='037heap.cc.html#L23'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L395" class="LineNr">395 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L396" class="LineNr">396 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L397" class="LineNr">397 </span><span class="Delimiter">}</span>
-<span id="L398" class="LineNr">398 </span>
-<span id="L399" class="LineNr">399 </span><span class="Comment">//:</span>
-<span id="L400" class="LineNr">400 </span>
-<span id="L401" class="LineNr">401 </span><span class="Delimiter">:(scenario xor_imm32_with_mem_at_r32)</span>
-<span id="L402" class="LineNr">402 </span><span class="Special">% Reg[EBX].i = 0x2000;</span>
-<span id="L403" class="LineNr">403 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
-<span id="L404" class="LineNr">404 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L405" class="LineNr">405 </span>  <span class="Constant">81</span>  <span class="Constant">33</span>                          0a 0b 0c 0d  <span class="Comment"># xor 0x0d0c0b0a with *EBX</span>
-<span id="L406" class="LineNr">406 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 110 (xor imm32) 011 (dest EBX)</span>
-<span id="L407" class="LineNr">407 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L408" class="LineNr">408 </span>a0 b0 c0 d0  <span class="Comment"># 0xd0c0b0a0</span>
-<span id="L409" class="LineNr">409 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
-<span id="L410" class="LineNr">410 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
-<span id="L411" class="LineNr">411 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a</span>
-<span id="L412" class="LineNr">412 </span><span class="traceContains">+run: subop xor</span>
-<span id="L413" class="LineNr">413 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
-<span id="L414" class="LineNr">414 </span>
-<span id="L415" class="LineNr">415 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
-<span id="L416" class="LineNr">416 </span><span class="Normal">case</span> <span class="Constant">6</span>: <span class="Delimiter">{</span>
-<span id="L417" class="LineNr">417 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop xor&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L418" class="LineNr">418 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L419" class="LineNr">419 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L420" class="LineNr">420 </span><span class="Delimiter">}</span>
-<span id="L421" class="LineNr">421 </span>
-<span id="L422" class="LineNr">422 </span><span class="Delimiter">:(scenario xor_imm32_with_r32)</span>
-<span id="L423" class="LineNr">423 </span><span class="Special">% Reg[EBX].i = 0xd0c0b0a0;</span>
-<span id="L424" class="LineNr">424 </span>== <span class="Constant">0x1</span>
-<span id="L425" class="LineNr">425 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L426" class="LineNr">426 </span>  <span class="Constant">81</span>  f3                          0a 0b 0c 0d  <span class="Comment"># xor 0x0d0c0b0a with EBX</span>
-<span id="L427" class="LineNr">427 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 110 (xor imm32) 011 (dest EBX)</span>
-<span id="L428" class="LineNr">428 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
-<span id="L429" class="LineNr">429 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L430" class="LineNr">430 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a</span>
-<span id="L431" class="LineNr">431 </span><span class="traceContains">+run: subop xor</span>
-<span id="L432" class="LineNr">432 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
-<span id="L433" class="LineNr">433 </span>
-<span id="L434" class="LineNr">434 </span><span class="SalientComment">//:: compare (cmp)</span>
-<span id="L435" class="LineNr">435 </span>
-<span id="L436" class="LineNr">436 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L437" class="LineNr">437 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;3d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;compare: set SF if <a href='010---vm.cc.html#L13'>EAX</a> &lt; <a href='037heap.cc.html#L23'>imm32</a> (cmp)&quot;</span><span class="Delimiter">);</span>
-<span id="L438" class="LineNr">438 </span>
-<span id="L439" class="LineNr">439 </span><span class="Delimiter">:(scenario compare_imm32_with_eax_greater)</span>
-<span id="L440" class="LineNr">440 </span><span class="Special">% Reg[EAX].i = 0x0d0c0b0a;</span>
-<span id="L441" class="LineNr">441 </span>== <span class="Constant">0x1</span>
-<span id="L442" class="LineNr">442 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L443" class="LineNr">443 </span>  3d                              <span class="PreProc">0</span><span class="Constant">7</span> 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b07 with EAX</span>
-<span id="L444" class="LineNr">444 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and <a href='037heap.cc.html#L23'>imm32</a> 0x0d0c0b07</span>
-<span id="L445" class="LineNr">445 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
-<span id="L446" class="LineNr">446 </span>
-<span id="L447" class="LineNr">447 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L448" class="LineNr">448 </span><span class="Normal">case</span> <span class="Constant">0x3d</span>: <span class="Delimiter">{</span>  <span class="Comment">// compare EAX with imm32</span>
-<span id="L449" class="LineNr">449 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg1 = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L450" class="LineNr">450 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L336'>next32</a><span class="Delimiter">();</span>
-<span id="L451" class="LineNr">451 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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='037heap.cc.html#L23'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L452" class="LineNr">452 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp1 = arg1 - arg2<span class="Delimiter">;</span>
-<span id="L453" class="LineNr">453 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L454" class="LineNr">454 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L455" class="LineNr">455 </span>  <span class="Normal">const</span> <span class="Normal">int64_t</span> tmp2 = arg1 - arg2<span class="Delimiter">;</span>
-<span id="L456" class="LineNr">456 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L457" class="LineNr">457 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L81'>OF</a> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L458" class="LineNr">458 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L459" class="LineNr">459 </span><span class="Delimiter">}</span>
-<span id="L460" class="LineNr">460 </span>
-<span id="L461" class="LineNr">461 </span><span class="Delimiter">:(scenario compare_imm32_with_eax_lesser)</span>
-<span id="L462" class="LineNr">462 </span><span class="Special">% Reg[EAX].i = 0x0d0c0b07;</span>
-<span id="L463" class="LineNr">463 </span>== <span class="Constant">0x1</span>
-<span id="L464" class="LineNr">464 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L465" class="LineNr">465 </span>  3d                              0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EAX</span>
-<span id="L466" class="LineNr">466 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and <a href='037heap.cc.html#L23'>imm32</a> 0x0d0c0b0a</span>
-<span id="L467" class="LineNr">467 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
-<span id="L468" class="LineNr">468 </span>
-<span id="L469" class="LineNr">469 </span><span class="Delimiter">:(scenario compare_imm32_with_eax_equal)</span>
-<span id="L470" class="LineNr">470 </span><span class="Special">% Reg[EAX].i = 0x0d0c0b0a;</span>
-<span id="L471" class="LineNr">471 </span>== <span class="Constant">0x1</span>
-<span id="L472" class="LineNr">472 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L473" class="LineNr">473 </span>  3d                              0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EAX</span>
-<span id="L474" class="LineNr">474 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and <a href='037heap.cc.html#L23'>imm32</a> 0x0d0c0b0a</span>
-<span id="L475" class="LineNr">475 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
-<span id="L476" class="LineNr">476 </span>
-<span id="L477" class="LineNr">477 </span><span class="Comment">//:</span>
-<span id="L478" class="LineNr">478 </span>
-<span id="L479" class="LineNr">479 </span><span class="Delimiter">:(scenario compare_imm32_with_r32_greater)</span>
-<span id="L480" class="LineNr">480 </span><span class="Special">% Reg[EBX].i = 0x0d0c0b0a;</span>
-<span id="L481" class="LineNr">481 </span>== <span class="Constant">0x1</span>
-<span id="L482" class="LineNr">482 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L483" class="LineNr">483 </span>  <span class="Constant">81</span>  fb                          <span class="PreProc">0</span><span class="Constant">7</span> 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b07 with EBX</span>
-<span id="L484" class="LineNr">484 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L485" class="LineNr">485 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
-<span id="L486" class="LineNr">486 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L487" class="LineNr">487 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b07</span>
-<span id="L488" class="LineNr">488 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
+<span id="L391" class="LineNr">391 </span><span class="Comment">//:</span>
+<span id="L392" class="LineNr">392 </span>
+<span id="L393" class="LineNr">393 </span><span class="Delimiter">:(code)</span>
+<span id="L394" class="LineNr">394 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L394'>test_and_imm32_with_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L395" class="LineNr">395 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0xff</span><span class="Delimiter">;</span>
+<span id="L396" class="LineNr">396 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L397" class="LineNr">397 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L398" class="LineNr">398 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L399" class="LineNr">399 </span>      <span class="Constant">&quot;  81     e3                          0a 0b 0c 0d \n&quot;</span>  <span class="Comment">// and 0x0d0c0b0a with EBX</span>
+<span id="L400" class="LineNr">400 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 100 (and imm32) 011 (dest EBX)</span>
+<span id="L401" class="LineNr">401 </span>  <span class="Delimiter">);</span>
+<span id="L402" class="LineNr">402 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L403" class="LineNr">403 </span>      <span class="Constant">&quot;run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32\n&quot;</span>
+<span id="L404" class="LineNr">404 </span>      <span class="Constant">&quot;run: r/m32 is EBX\n&quot;</span>
+<span id="L405" class="LineNr">405 </span>      <span class="Constant">&quot;run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a\n&quot;</span>
+<span id="L406" class="LineNr">406 </span>      <span class="Constant">&quot;run: subop and\n&quot;</span>
+<span id="L407" class="LineNr">407 </span>      <span class="Constant">&quot;run: storing 0x0000000a\n&quot;</span>
+<span id="L408" class="LineNr">408 </span>  <span class="Delimiter">);</span>
+<span id="L409" class="LineNr">409 </span><span class="Delimiter">}</span>
+<span id="L410" class="LineNr">410 </span>
+<span id="L411" class="LineNr">411 </span><span class="SalientComment">//:: or</span>
+<span id="L412" class="LineNr">412 </span>
+<span id="L413" class="LineNr">413 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L414" class="LineNr">414 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;0d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;EAX = bitwise OR of <a href='037heap.cc.html#L23'>imm32</a> with <a href='010---vm.cc.html#L13'>EAX</a> (or)&quot;</span><span class="Delimiter">);</span>
+<span id="L415" class="LineNr">415 </span>
+<span id="L416" class="LineNr">416 </span><span class="Delimiter">:(code)</span>
+<span id="L417" class="LineNr">417 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L417'>test_or_imm32_with_eax</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L418" class="LineNr">418 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0xd0c0b0a0</span><span class="Delimiter">;</span>
+<span id="L419" class="LineNr">419 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L420" class="LineNr">420 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L421" class="LineNr">421 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L422" class="LineNr">422 </span>      <span class="Constant">&quot;  0d                                 0a 0b 0c 0d \n&quot;</span>  <span class="Comment">// or 0x0d0c0b0a with EAX</span>
+<span id="L423" class="LineNr">423 </span>  <span class="Delimiter">);</span>
+<span id="L424" class="LineNr">424 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L425" class="LineNr">425 </span>      <span class="Constant">&quot;run: or <a href='037heap.cc.html#L23'>imm32</a> 0x0d0c0b0a with EAX\n&quot;</span>
+<span id="L426" class="LineNr">426 </span>      <span class="Constant">&quot;run: storing 0xddccbbaa\n&quot;</span>
+<span id="L427" class="LineNr">427 </span>  <span class="Delimiter">);</span>
+<span id="L428" class="LineNr">428 </span><span class="Delimiter">}</span>
+<span id="L429" class="LineNr">429 </span>
+<span id="L430" class="LineNr">430 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L431" class="LineNr">431 </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="L432" class="LineNr">432 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L366'>next32</a><span class="Delimiter">();</span>
+<span id="L433" class="LineNr">433 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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='037heap.cc.html#L23'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L434" class="LineNr">434 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L435" class="LineNr">435 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L436" class="LineNr">436 </span><span class="Delimiter">}</span>
+<span id="L437" class="LineNr">437 </span>
+<span id="L438" class="LineNr">438 </span><span class="Comment">//:</span>
+<span id="L439" class="LineNr">439 </span>
+<span id="L440" class="LineNr">440 </span><span class="Delimiter">:(code)</span>
+<span id="L441" class="LineNr">441 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L441'>test_or_imm32_with_mem_at_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L442" class="LineNr">442 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L443" class="LineNr">443 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L444" class="LineNr">444 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L445" class="LineNr">445 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L446" class="LineNr">446 </span>      <span class="Constant">&quot;  81     0b                          0a 0b 0c 0d \n&quot;</span>  <span class="Comment">// or 0x0d0c0b0a with *EBX</span>
+<span id="L447" class="LineNr">447 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 001 (or imm32) 011 (dest EBX)</span>
+<span id="L448" class="LineNr">448 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L449" class="LineNr">449 </span>      <span class="Constant">&quot;a0 b0 c0 d0\n&quot;</span>  <span class="Comment">// 0xd0c0b0a0</span>
+<span id="L450" class="LineNr">450 </span>  <span class="Delimiter">);</span>
+<span id="L451" class="LineNr">451 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L452" class="LineNr">452 </span>      <span class="Constant">&quot;run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32\n&quot;</span>
+<span id="L453" class="LineNr">453 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EBX)\n&quot;</span>
+<span id="L454" class="LineNr">454 </span>      <span class="Constant">&quot;run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a\n&quot;</span>
+<span id="L455" class="LineNr">455 </span>      <span class="Constant">&quot;run: subop or\n&quot;</span>
+<span id="L456" class="LineNr">456 </span>      <span class="Constant">&quot;run: storing 0xddccbbaa\n&quot;</span>
+<span id="L457" class="LineNr">457 </span>  <span class="Delimiter">);</span>
+<span id="L458" class="LineNr">458 </span><span class="Delimiter">}</span>
+<span id="L459" class="LineNr">459 </span>
+<span id="L460" class="LineNr">460 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
+<span id="L461" class="LineNr">461 </span><span class="Normal">case</span> <span class="Constant">1</span>: <span class="Delimiter">{</span>
+<span id="L462" class="LineNr">462 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop or&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L463" class="LineNr">463 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L464" class="LineNr">464 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L465" class="LineNr">465 </span><span class="Delimiter">}</span>
+<span id="L466" class="LineNr">466 </span>
+<span id="L467" class="LineNr">467 </span><span class="Delimiter">:(code)</span>
+<span id="L468" class="LineNr">468 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L468'>test_or_imm32_with_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L469" class="LineNr">469 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0xd0c0b0a0</span><span class="Delimiter">;</span>
+<span id="L470" class="LineNr">470 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L471" class="LineNr">471 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L472" class="LineNr">472 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L473" class="LineNr">473 </span>      <span class="Constant">&quot;  81     cb                          0a 0b 0c 0d \n&quot;</span>  <span class="Comment">// or 0x0d0c0b0a with EBX</span>
+<span id="L474" class="LineNr">474 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 001 (or imm32) 011 (dest EBX)</span>
+<span id="L475" class="LineNr">475 </span>  <span class="Delimiter">);</span>
+<span id="L476" class="LineNr">476 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L477" class="LineNr">477 </span>      <span class="Constant">&quot;run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32\n&quot;</span>
+<span id="L478" class="LineNr">478 </span>      <span class="Constant">&quot;run: r/m32 is EBX\n&quot;</span>
+<span id="L479" class="LineNr">479 </span>      <span class="Constant">&quot;run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a\n&quot;</span>
+<span id="L480" class="LineNr">480 </span>      <span class="Constant">&quot;run: subop or\n&quot;</span>
+<span id="L481" class="LineNr">481 </span>      <span class="Constant">&quot;run: storing 0xddccbbaa\n&quot;</span>
+<span id="L482" class="LineNr">482 </span>  <span class="Delimiter">);</span>
+<span id="L483" class="LineNr">483 </span><span class="Delimiter">}</span>
+<span id="L484" class="LineNr">484 </span>
+<span id="L485" class="LineNr">485 </span><span class="SalientComment">//:: xor</span>
+<span id="L486" class="LineNr">486 </span>
+<span id="L487" class="LineNr">487 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L488" class="LineNr">488 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;35&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;EAX = bitwise XOR of <a href='037heap.cc.html#L23'>imm32</a> with <a href='010---vm.cc.html#L13'>EAX</a> (xor)&quot;</span><span class="Delimiter">);</span>
 <span id="L489" class="LineNr">489 </span>
-<span id="L490" class="LineNr">490 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
-<span id="L491" class="LineNr">491 </span><span class="Normal">case</span> <span class="Constant">7</span>: <span class="Delimiter">{</span>
-<span id="L492" class="LineNr">492 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop compare&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L493" class="LineNr">493 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span>
-<span id="L494" class="LineNr">494 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L495" class="LineNr">495 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L496" class="LineNr">496 </span>  <span class="Normal">const</span> <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span>
-<span id="L497" class="LineNr">497 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L498" class="LineNr">498 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L81'>OF</a> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L499" class="LineNr">499 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L500" class="LineNr">500 </span><span class="Delimiter">}</span>
-<span id="L501" class="LineNr">501 </span>
-<span id="L502" class="LineNr">502 </span><span class="Delimiter">:(scenario compare_imm32_with_r32_lesser)</span>
-<span id="L503" class="LineNr">503 </span><span class="Special">% Reg[EBX].i = 0x0d0c0b07;</span>
-<span id="L504" class="LineNr">504 </span>== <span class="Constant">0x1</span>
-<span id="L505" class="LineNr">505 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L506" class="LineNr">506 </span>  <span class="Constant">81</span>  fb                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EBX</span>
-<span id="L507" class="LineNr">507 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L508" class="LineNr">508 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
-<span id="L509" class="LineNr">509 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L510" class="LineNr">510 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a</span>
-<span id="L511" class="LineNr">511 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
-<span id="L512" class="LineNr">512 </span>
-<span id="L513" class="LineNr">513 </span><span class="Delimiter">:(scenario compare_imm32_with_r32_equal)</span>
-<span id="L514" class="LineNr">514 </span><span class="Special">% Reg[EBX].i = 0x0d0c0b0a;</span>
-<span id="L515" class="LineNr">515 </span>== <span class="Constant">0x1</span>
-<span id="L516" class="LineNr">516 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L517" class="LineNr">517 </span>  <span class="Constant">81</span>  fb                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EBX</span>
-<span id="L518" class="LineNr">518 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L519" class="LineNr">519 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
-<span id="L520" class="LineNr">520 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L521" class="LineNr">521 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a</span>
-<span id="L522" class="LineNr">522 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
-<span id="L523" class="LineNr">523 </span>
-<span id="L524" class="LineNr">524 </span><span class="Delimiter">:(scenario compare_imm32_with_mem_at_r32_greater)</span>
-<span id="L525" class="LineNr">525 </span><span class="Special">% Reg[EBX].i = 0x2000;</span>
-<span id="L526" class="LineNr">526 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
-<span id="L527" class="LineNr">527 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L528" class="LineNr">528 </span>  <span class="Constant">81</span>  3b                          <span class="PreProc">0</span><span class="Constant">7</span> 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b07 with *EBX</span>
-<span id="L529" class="LineNr">529 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L530" class="LineNr">530 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L531" class="LineNr">531 </span>0a 0b 0c 0d  <span class="Comment"># 0x0d0c0b0a</span>
-<span id="L532" class="LineNr">532 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
-<span id="L533" class="LineNr">533 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
-<span id="L534" class="LineNr">534 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b07</span>
-<span id="L535" class="LineNr">535 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
-<span id="L536" class="LineNr">536 </span>
-<span id="L537" class="LineNr">537 </span><span class="Delimiter">:(scenario compare_imm32_with_mem_at_r32_lesser)</span>
-<span id="L538" class="LineNr">538 </span><span class="Special">% Reg[EBX].i = 0x2000;</span>
-<span id="L539" class="LineNr">539 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
-<span id="L540" class="LineNr">540 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L541" class="LineNr">541 </span>  <span class="Constant">81</span>  3b                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with *EBX</span>
-<span id="L542" class="LineNr">542 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L543" class="LineNr">543 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L544" class="LineNr">544 </span><span class="PreProc">0</span><span class="Constant">7</span> 0b 0c 0d  <span class="Comment"># 0x0d0c0b07</span>
-<span id="L545" class="LineNr">545 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
-<span id="L546" class="LineNr">546 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
-<span id="L547" class="LineNr">547 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a</span>
-<span id="L548" class="LineNr">548 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
-<span id="L549" class="LineNr">549 </span>
-<span id="L550" class="LineNr">550 </span><span class="Delimiter">:(scenario compare_imm32_with_mem_at_r32_equal)</span>
-<span id="L551" class="LineNr">551 </span><span class="Special">% Reg[EBX].i = 0x0d0c0b0a;</span>
-<span id="L552" class="LineNr">552 </span><span class="Special">% Reg[EBX].i = 0x2000;</span>
-<span id="L553" class="LineNr">553 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
-<span id="L554" class="LineNr">554 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L555" class="LineNr">555 </span>  <span class="Constant">81</span>  3b                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with *EBX</span>
-<span id="L556" class="LineNr">556 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L557" class="LineNr">557 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L558" class="LineNr">558 </span>0a 0b 0c 0d  <span class="Comment"># 0x0d0c0b0a</span>
-<span id="L559" class="LineNr">559 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
-<span id="L560" class="LineNr">560 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
-<span id="L561" class="LineNr">561 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a</span>
-<span id="L562" class="LineNr">562 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
+<span id="L490" class="LineNr">490 </span><span class="Delimiter">:(code)</span>
+<span id="L491" class="LineNr">491 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L491'>test_xor_imm32_with_eax</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L492" class="LineNr">492 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0xddccb0a0</span><span class="Delimiter">;</span>
+<span id="L493" class="LineNr">493 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L494" class="LineNr">494 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L495" class="LineNr">495 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L496" class="LineNr">496 </span>      <span class="Constant">&quot;  35                                 0a 0b 0c 0d \n&quot;</span>  <span class="Comment">// xor 0x0d0c0b0a with EAX</span>
+<span id="L497" class="LineNr">497 </span>  <span class="Delimiter">);</span>
+<span id="L498" class="LineNr">498 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L499" class="LineNr">499 </span>      <span class="Constant">&quot;run: xor <a href='037heap.cc.html#L23'>imm32</a> 0x0d0c0b0a with EAX\n&quot;</span>
+<span id="L500" class="LineNr">500 </span>      <span class="Constant">&quot;run: storing 0xd0c0bbaa\n&quot;</span>
+<span id="L501" class="LineNr">501 </span>  <span class="Delimiter">);</span>
+<span id="L502" class="LineNr">502 </span><span class="Delimiter">}</span>
+<span id="L503" class="LineNr">503 </span>
+<span id="L504" class="LineNr">504 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L505" class="LineNr">505 </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="L506" class="LineNr">506 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L366'>next32</a><span class="Delimiter">();</span>
+<span id="L507" class="LineNr">507 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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='037heap.cc.html#L23'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L508" class="LineNr">508 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L509" class="LineNr">509 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L510" class="LineNr">510 </span><span class="Delimiter">}</span>
+<span id="L511" class="LineNr">511 </span>
+<span id="L512" class="LineNr">512 </span><span class="Comment">//:</span>
+<span id="L513" class="LineNr">513 </span>
+<span id="L514" class="LineNr">514 </span><span class="Delimiter">:(code)</span>
+<span id="L515" class="LineNr">515 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L515'>test_xor_imm32_with_mem_at_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L516" class="LineNr">516 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L517" class="LineNr">517 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L518" class="LineNr">518 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L519" class="LineNr">519 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L520" class="LineNr">520 </span>      <span class="Constant">&quot;  81     33                          0a 0b 0c 0d \n&quot;</span>  <span class="Comment">// xor 0x0d0c0b0a with *EBX</span>
+<span id="L521" class="LineNr">521 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 110 (xor imm32) 011 (dest EBX)</span>
+<span id="L522" class="LineNr">522 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L523" class="LineNr">523 </span>      <span class="Constant">&quot;a0 b0 c0 d0\n&quot;</span>  <span class="Comment">// 0xd0c0b0a0</span>
+<span id="L524" class="LineNr">524 </span>  <span class="Delimiter">);</span>
+<span id="L525" class="LineNr">525 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L526" class="LineNr">526 </span>      <span class="Constant">&quot;run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32\n&quot;</span>
+<span id="L527" class="LineNr">527 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EBX)\n&quot;</span>
+<span id="L528" class="LineNr">528 </span>      <span class="Constant">&quot;run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a\n&quot;</span>
+<span id="L529" class="LineNr">529 </span>      <span class="Constant">&quot;run: subop xor\n&quot;</span>
+<span id="L530" class="LineNr">530 </span>      <span class="Constant">&quot;run: storing 0xddccbbaa\n&quot;</span>
+<span id="L531" class="LineNr">531 </span>  <span class="Delimiter">);</span>
+<span id="L532" class="LineNr">532 </span><span class="Delimiter">}</span>
+<span id="L533" class="LineNr">533 </span>
+<span id="L534" class="LineNr">534 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
+<span id="L535" class="LineNr">535 </span><span class="Normal">case</span> <span class="Constant">6</span>: <span class="Delimiter">{</span>
+<span id="L536" class="LineNr">536 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop xor&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L537" class="LineNr">537 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L538" class="LineNr">538 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L539" class="LineNr">539 </span><span class="Delimiter">}</span>
+<span id="L540" class="LineNr">540 </span>
+<span id="L541" class="LineNr">541 </span><span class="Delimiter">:(code)</span>
+<span id="L542" class="LineNr">542 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L542'>test_xor_imm32_with_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L543" class="LineNr">543 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0xd0c0b0a0</span><span class="Delimiter">;</span>
+<span id="L544" class="LineNr">544 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L545" class="LineNr">545 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L546" class="LineNr">546 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L547" class="LineNr">547 </span>      <span class="Constant">&quot;  81     f3                          0a 0b 0c 0d \n&quot;</span>  <span class="Comment">// xor 0x0d0c0b0a with EBX</span>
+<span id="L548" class="LineNr">548 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 110 (xor imm32) 011 (dest EBX)</span>
+<span id="L549" class="LineNr">549 </span>  <span class="Delimiter">);</span>
+<span id="L550" class="LineNr">550 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L551" class="LineNr">551 </span>      <span class="Constant">&quot;run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32\n&quot;</span>
+<span id="L552" class="LineNr">552 </span>      <span class="Constant">&quot;run: r/m32 is EBX\n&quot;</span>
+<span id="L553" class="LineNr">553 </span>      <span class="Constant">&quot;run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a\n&quot;</span>
+<span id="L554" class="LineNr">554 </span>      <span class="Constant">&quot;run: subop xor\n&quot;</span>
+<span id="L555" class="LineNr">555 </span>      <span class="Constant">&quot;run: storing 0xddccbbaa\n&quot;</span>
+<span id="L556" class="LineNr">556 </span>  <span class="Delimiter">);</span>
+<span id="L557" class="LineNr">557 </span><span class="Delimiter">}</span>
+<span id="L558" class="LineNr">558 </span>
+<span id="L559" class="LineNr">559 </span><span class="SalientComment">//:: compare (cmp)</span>
+<span id="L560" class="LineNr">560 </span>
+<span id="L561" class="LineNr">561 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L562" class="LineNr">562 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;3d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;compare: set SF if <a href='010---vm.cc.html#L13'>EAX</a> &lt; <a href='037heap.cc.html#L23'>imm32</a> (cmp)&quot;</span><span class="Delimiter">);</span>
 <span id="L563" class="LineNr">563 </span>
-<span id="L564" class="LineNr">564 </span><span class="SalientComment">//:: copy (mov)</span>
-<span id="L565" class="LineNr">565 </span>
-<span id="L566" class="LineNr">566 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L567" class="LineNr">567 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;b8&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='037heap.cc.html#L23'>imm32</a> to <a href='010---vm.cc.html#L13'>EAX</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L568" class="LineNr">568 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;b9&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='037heap.cc.html#L23'>imm32</a> to <a href='010---vm.cc.html#L14'>ECX</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L569" class="LineNr">569 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;ba&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='037heap.cc.html#L23'>imm32</a> to <a href='010---vm.cc.html#L15'>EDX</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L570" class="LineNr">570 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bb&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='037heap.cc.html#L23'>imm32</a> to <a href='010---vm.cc.html#L16'>EBX</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L571" class="LineNr">571 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bc&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='037heap.cc.html#L23'>imm32</a> to <a href='010---vm.cc.html#L17'>ESP</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L572" class="LineNr">572 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bd&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='037heap.cc.html#L23'>imm32</a> to <a href='010---vm.cc.html#L18'>EBP</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L573" class="LineNr">573 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;be&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='037heap.cc.html#L23'>imm32</a> to <a href='010---vm.cc.html#L19'>ESI</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L574" class="LineNr">574 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bf&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='037heap.cc.html#L23'>imm32</a> to <a href='010---vm.cc.html#L20'>EDI</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L575" class="LineNr">575 </span>
-<span id="L576" class="LineNr">576 </span><span class="Delimiter">:(scenario copy_imm32_to_r32)</span>
-<span id="L577" class="LineNr">577 </span>== <span class="Constant">0x1</span>
-<span id="L578" class="LineNr">578 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L579" class="LineNr">579 </span>  bb                              0a 0b 0c 0d  <span class="Comment"># copy 0x0d0c0b0a to EBX</span>
-<span id="L580" class="LineNr">580 </span><span class="traceContains">+run: copy <a href='037heap.cc.html#L23'>imm32</a> 0x0d0c0b0a to <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L581" class="LineNr">581 </span>
-<span id="L582" class="LineNr">582 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L583" class="LineNr">583 </span><span class="Normal">case</span> <span class="Constant">0xb8</span>:
-<span id="L584" class="LineNr">584 </span><span class="Normal">case</span> <span class="Constant">0xb9</span>:
-<span id="L585" class="LineNr">585 </span><span class="Normal">case</span> <span class="Constant">0xba</span>:
-<span id="L586" class="LineNr">586 </span><span class="Normal">case</span> <span class="Constant">0xbb</span>:
-<span id="L587" class="LineNr">587 </span><span class="Normal">case</span> <span class="Constant">0xbc</span>:
-<span id="L588" class="LineNr">588 </span><span class="Normal">case</span> <span class="Constant">0xbd</span>:
-<span id="L589" class="LineNr">589 </span><span class="Normal">case</span> <span class="Constant">0xbe</span>:
-<span id="L590" class="LineNr">590 </span><span class="Normal">case</span> <span class="Constant">0xbf</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy imm32 to r32</span>
-<span id="L591" class="LineNr">591 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> rdest = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L592" class="LineNr">592 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> src = <a href='011run.cc.html#L336'>next32</a><span class="Delimiter">();</span>
-<span id="L593" class="LineNr">593 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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='037heap.cc.html#L23'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; src &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L63'>rname</a><span class="Delimiter">(</span>rdest<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L594" class="LineNr">594 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rdest]<span class="Delimiter">.</span>i = src<span class="Delimiter">;</span>
-<span id="L595" class="LineNr">595 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L596" class="LineNr">596 </span><span class="Delimiter">}</span>
-<span id="L597" class="LineNr">597 </span>
-<span id="L598" class="LineNr">598 </span><span class="Comment">//:</span>
-<span id="L599" class="LineNr">599 </span>
-<span id="L600" class="LineNr">600 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L601" class="LineNr">601 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='037heap.cc.html#L23'>imm32</a> to rm32 (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L602" class="LineNr">602 </span>
-<span id="L603" class="LineNr">603 </span><span class="Delimiter">:(scenario copy_imm32_to_mem_at_r32)</span>
-<span id="L604" class="LineNr">604 </span><span class="Special">% Reg[EBX].i = 0x60;</span>
-<span id="L605" class="LineNr">605 </span>== <span class="Constant">0x1</span>
-<span id="L606" class="LineNr">606 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L607" class="LineNr">607 </span>  c7  <span class="PreProc">0</span><span class="Constant">3</span>                          0a 0b 0c 0d  <span class="Comment"># copy 0x0d0c0b0a to *EBX</span>
-<span id="L608" class="LineNr">608 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 000 (unused) 011 (dest EBX)</span>
-<span id="L609" class="LineNr">609 </span><span class="traceContains">+run: copy <a href='037heap.cc.html#L23'>imm32</a> to r/m32</span>
-<span id="L610" class="LineNr">610 </span><span class="traceContains">+run: effective address is 0x00000060 (EBX)</span>
-<span id="L611" class="LineNr">611 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a</span>
-<span id="L612" class="LineNr">612 </span>
-<span id="L613" class="LineNr">613 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L614" class="LineNr">614 </span><span class="Normal">case</span> <span class="Constant">0xc7</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy imm32 to r32</span>
-<span id="L615" class="LineNr">615 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L616" class="LineNr">616 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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='037heap.cc.html#L23'>imm32</a> to r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L617" class="LineNr">617 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
-<span id="L618" class="LineNr">618 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>subop != <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L619" class="LineNr">619 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized subop for opcode c7: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; (only 0/copy currently implemented)\n&quot;</span><span class="Delimiter">;</span>
-<span id="L620" class="LineNr">620 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L621" class="LineNr">621 </span>  <span class="Delimiter">}</span>
-<span id="L622" class="LineNr">622 </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="L623" class="LineNr">623 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> src = <a href='011run.cc.html#L336'>next32</a><span class="Delimiter">();</span>
-<span id="L624" class="LineNr">624 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;imm32 is 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; src &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L625" class="LineNr">625 </span>  *dest = src<span class="Delimiter">;</span>
-<span id="L626" class="LineNr">626 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L627" class="LineNr">627 </span><span class="Delimiter">}</span>
-<span id="L628" class="LineNr">628 </span>
-<span id="L629" class="LineNr">629 </span><span class="SalientComment">//:: push</span>
-<span id="L630" class="LineNr">630 </span>
-<span id="L631" class="LineNr">631 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L632" class="LineNr">632 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;68&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='037heap.cc.html#L23'>imm32</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
-<span id="L633" class="LineNr">633 </span>
-<span id="L634" class="LineNr">634 </span><span class="Delimiter">:(scenario push_imm32)</span>
-<span id="L635" class="LineNr">635 </span><span class="Special">% Reg[ESP].u = 0x14;</span>
-<span id="L636" class="LineNr">636 </span>== <span class="Constant">0x1</span>
-<span id="L637" class="LineNr">637 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L638" class="LineNr">638 </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="L639" class="LineNr">639 </span><span class="traceContains">+run: <a href='012elf.cc.html#L90'>push</a> <a href='037heap.cc.html#L23'>imm32</a> 0x000000af</span>
-<span id="L640" class="LineNr">640 </span><span class="traceContains">+run: <a href='010---vm.cc.html#L17'>ESP</a> is now 0x00000010</span>
-<span id="L641" class="LineNr">641 </span><span class="traceContains">+run: <a href='003trace.cc.html#L131'>contents</a> at <a href='010---vm.cc.html#L17'>ESP</a>: 0x000000af</span>
-<span id="L642" class="LineNr">642 </span>
-<span id="L643" class="LineNr">643 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L644" class="LineNr">644 </span><span class="Normal">case</span> <span class="Constant">0x68</span>: <span class="Delimiter">{</span>
-<span id="L645" class="LineNr">645 </span>  <span class="Normal">const</span> <span class="Normal">uint32_t</span> val = <span class="Normal">static_cast</span>&lt;<span class="Normal">uint32_t</span>&gt;<span class="Delimiter">(</span><a href='011run.cc.html#L336'>next32</a><span class="Delimiter">());</span>
-<span id="L646" class="LineNr">646 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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='037heap.cc.html#L23'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; val &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L647" class="LineNr">647 </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="L648" class="LineNr">648 </span>  <a href='012elf.cc.html#L90'>push</a><span class="Delimiter">(</span>val<span class="Delimiter">);</span>
-<span id="L649" class="LineNr">649 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L433'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L650" class="LineNr">650 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L433'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L209'>read_mem_u32</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L651" class="LineNr">651 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L652" class="LineNr">652 </span><span class="Delimiter">}</span>
+<span id="L564" class="LineNr">564 </span><span class="Delimiter">:(code)</span>
+<span id="L565" class="LineNr">565 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L565'>test_compare_imm32_with_eax_greater</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L566" class="LineNr">566 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x0d0c0b0a</span><span class="Delimiter">;</span>
+<span id="L567" class="LineNr">567 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L568" class="LineNr">568 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L569" class="LineNr">569 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L570" class="LineNr">570 </span>      <span class="Constant">&quot;  3d                                 07 0b 0c 0d \n&quot;</span>  <span class="Comment">// compare 0x0d0c0b07 with EAX</span>
+<span id="L571" class="LineNr">571 </span>  <span class="Delimiter">);</span>
+<span id="L572" class="LineNr">572 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L573" class="LineNr">573 </span>      <span class="Constant">&quot;run: compare <a href='010---vm.cc.html#L13'>EAX</a> and <a href='037heap.cc.html#L23'>imm32</a> 0x0d0c0b07\n&quot;</span>
+<span id="L574" class="LineNr">574 </span>      <span class="Constant">&quot;run: SF=0; ZF=0; OF=0\n&quot;</span>
+<span id="L575" class="LineNr">575 </span>  <span class="Delimiter">);</span>
+<span id="L576" class="LineNr">576 </span><span class="Delimiter">}</span>
+<span id="L577" class="LineNr">577 </span>
+<span id="L578" class="LineNr">578 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L579" class="LineNr">579 </span><span class="Normal">case</span> <span class="Constant">0x3d</span>: <span class="Delimiter">{</span>  <span class="Comment">// compare EAX with imm32</span>
+<span id="L580" class="LineNr">580 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg1 = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
+<span id="L581" class="LineNr">581 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L366'>next32</a><span class="Delimiter">();</span>
+<span id="L582" class="LineNr">582 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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='037heap.cc.html#L23'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L583" class="LineNr">583 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp1 = arg1 - arg2<span class="Delimiter">;</span>
+<span id="L584" class="LineNr">584 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L585" class="LineNr">585 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L586" class="LineNr">586 </span>  <span class="Normal">const</span> <span class="Normal">int64_t</span> tmp2 = arg1 - arg2<span class="Delimiter">;</span>
+<span id="L587" class="LineNr">587 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
+<span id="L588" class="LineNr">588 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L80'>ZF</a> &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L81'>OF</a> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L589" class="LineNr">589 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L590" class="LineNr">590 </span><span class="Delimiter">}</span>
+<span id="L591" class="LineNr">591 </span>
+<span id="L592" class="LineNr">592 </span><span class="Delimiter">:(code)</span>
+<span id="L593" class="LineNr">593 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L593'>test_compare_imm32_with_eax_lesser</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L594" class="LineNr">594 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x0d0c0b07</span><span class="Delimiter">;</span>
+<span id="L595" class="LineNr">595 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L596" class="LineNr">596 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L597" class="LineNr">597 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L598" class="LineNr">598 </span>      <span class="Constant">&quot;  3d                                 0a 0b 0c 0d \n&quot;</span>  <span class="Comment">// compare 0x0d0c0b0a with EAX</span>
+<span id="L599" class="LineNr">599 </span>  <span class="Delimiter">);</span>
+<span id="L600" class="LineNr">600 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L601" class="LineNr">601 </span>      <span class="Constant">&quot;run: compare <a href='010---vm.cc.html#L13'>EAX</a> and <a href='037heap.cc.html#L23'>imm32</a> 0x0d0c0b0a\n&quot;</span>
+<span id="L602" class="LineNr">602 </span>      <span class="Constant">&quot;run: SF=1; ZF=0; OF=0\n&quot;</span>
+<span id="L603" class="LineNr">603 </span>  <span class="Delimiter">);</span>
+<span id="L604" class="LineNr">604 </span><span class="Delimiter">}</span>
+<span id="L605" class="LineNr">605 </span>
+<span id="L606" class="LineNr">606 </span><span class="Delimiter">:(code)</span>
+<span id="L607" class="LineNr">607 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L607'>test_compare_imm32_with_eax_equal</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L608" class="LineNr">608 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x0d0c0b0a</span><span class="Delimiter">;</span>
+<span id="L609" class="LineNr">609 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L610" class="LineNr">610 </span>      <span class="Constant">&quot;== 0x1\n&quot;</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="Constant">&quot;  3d                                 0a 0b 0c 0d \n&quot;</span>  <span class="Comment">// compare 0x0d0c0b0a with EAX</span>
+<span id="L613" class="LineNr">613 </span>  <span class="Delimiter">);</span>
+<span id="L614" class="LineNr">614 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L615" class="LineNr">615 </span>      <span class="Constant">&quot;run: compare <a href='010---vm.cc.html#L13'>EAX</a> and <a href='037heap.cc.html#L23'>imm32</a> 0x0d0c0b0a\n&quot;</span>
+<span id="L616" class="LineNr">616 </span>      <span class="Constant">&quot;run: SF=0; ZF=1; OF=0\n&quot;</span>
+<span id="L617" class="LineNr">617 </span>  <span class="Delimiter">);</span>
+<span id="L618" class="LineNr">618 </span><span class="Delimiter">}</span>
+<span id="L619" class="LineNr">619 </span>
+<span id="L620" class="LineNr">620 </span><span class="Comment">//:</span>
+<span id="L621" class="LineNr">621 </span>
+<span id="L622" class="LineNr">622 </span><span class="Delimiter">:(code)</span>
+<span id="L623" class="LineNr">623 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L623'>test_compare_imm32_with_r32_greater</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L624" class="LineNr">624 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x0d0c0b0a</span><span class="Delimiter">;</span>
+<span id="L625" class="LineNr">625 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L626" class="LineNr">626 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L627" class="LineNr">627 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L628" class="LineNr">628 </span>      <span class="Constant">&quot;  81     fb                          07 0b 0c 0d \n&quot;</span>  <span class="Comment">// compare 0x0d0c0b07 with EBX</span>
+<span id="L629" class="LineNr">629 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span>
+<span id="L630" class="LineNr">630 </span>  <span class="Delimiter">);</span>
+<span id="L631" class="LineNr">631 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L632" class="LineNr">632 </span>      <span class="Constant">&quot;run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32\n&quot;</span>
+<span id="L633" class="LineNr">633 </span>      <span class="Constant">&quot;run: r/m32 is EBX\n&quot;</span>
+<span id="L634" class="LineNr">634 </span>      <span class="Constant">&quot;run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b07\n&quot;</span>
+<span id="L635" class="LineNr">635 </span>      <span class="Constant">&quot;run: SF=0; ZF=0; OF=0\n&quot;</span>
+<span id="L636" class="LineNr">636 </span>  <span class="Delimiter">);</span>
+<span id="L637" class="LineNr">637 </span><span class="Delimiter">}</span>
+<span id="L638" class="LineNr">638 </span>
+<span id="L639" class="LineNr">639 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
+<span id="L640" class="LineNr">640 </span><span class="Normal">case</span> <span class="Constant">7</span>: <span class="Delimiter">{</span>
+<span id="L641" class="LineNr">641 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop compare&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L642" class="LineNr">642 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span>
+<span id="L643" class="LineNr">643 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L644" class="LineNr">644 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L645" class="LineNr">645 </span>  <span class="Normal">const</span> <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span>
+<span id="L646" class="LineNr">646 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
+<span id="L647" class="LineNr">647 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L80'>ZF</a> &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L81'>OF</a> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L648" class="LineNr">648 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L649" class="LineNr">649 </span><span class="Delimiter">}</span>
+<span id="L650" class="LineNr">650 </span>
+<span id="L651" class="LineNr">651 </span><span class="Delimiter">:(code)</span>
+<span id="L652" class="LineNr">652 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L652'>test_compare_imm32_with_r32_lesser</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L653" class="LineNr">653 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x0d0c0b07</span><span class="Delimiter">;</span>
+<span id="L654" class="LineNr">654 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L655" class="LineNr">655 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L656" class="LineNr">656 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L657" class="LineNr">657 </span>      <span class="Constant">&quot;  81     fb                          0a 0b 0c 0d \n&quot;</span>  <span class="Comment">// compare 0x0d0c0b0a with EBX</span>
+<span id="L658" class="LineNr">658 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span>
+<span id="L659" class="LineNr">659 </span>  <span class="Delimiter">);</span>
+<span id="L660" class="LineNr">660 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L661" class="LineNr">661 </span>      <span class="Constant">&quot;run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32\n&quot;</span>
+<span id="L662" class="LineNr">662 </span>      <span class="Constant">&quot;run: r/m32 is EBX\n&quot;</span>
+<span id="L663" class="LineNr">663 </span>      <span class="Constant">&quot;run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a\n&quot;</span>
+<span id="L664" class="LineNr">664 </span>      <span class="Constant">&quot;run: SF=1; ZF=0; OF=0\n&quot;</span>
+<span id="L665" class="LineNr">665 </span>  <span class="Delimiter">);</span>
+<span id="L666" class="LineNr">666 </span><span class="Delimiter">}</span>
+<span id="L667" class="LineNr">667 </span>
+<span id="L668" class="LineNr">668 </span><span class="Delimiter">:(code)</span>
+<span id="L669" class="LineNr">669 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L669'>test_compare_imm32_with_r32_equal</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L670" class="LineNr">670 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x0d0c0b0a</span><span class="Delimiter">;</span>
+<span id="L671" class="LineNr">671 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L672" class="LineNr">672 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L673" class="LineNr">673 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L674" class="LineNr">674 </span>      <span class="Constant">&quot;  81     fb                          0a 0b 0c 0d \n&quot;</span>  <span class="Comment">// compare 0x0d0c0b0a with EBX</span>
+<span id="L675" class="LineNr">675 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span>
+<span id="L676" class="LineNr">676 </span>  <span class="Delimiter">);</span>
+<span id="L677" class="LineNr">677 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L678" class="LineNr">678 </span>      <span class="Constant">&quot;run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32\n&quot;</span>
+<span id="L679" class="LineNr">679 </span>      <span class="Constant">&quot;run: r/m32 is EBX\n&quot;</span>
+<span id="L680" class="LineNr">680 </span>      <span class="Constant">&quot;run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a\n&quot;</span>
+<span id="L681" class="LineNr">681 </span>      <span class="Constant">&quot;run: SF=0; ZF=1; OF=0\n&quot;</span>
+<span id="L682" class="LineNr">682 </span>  <span class="Delimiter">);</span>
+<span id="L683" class="LineNr">683 </span><span class="Delimiter">}</span>
+<span id="L684" class="LineNr">684 </span>
+<span id="L685" class="LineNr">685 </span><span class="Delimiter">:(code)</span>
+<span id="L686" class="LineNr">686 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L686'>test_compare_imm32_with_mem_at_r32_greater</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L687" class="LineNr">687 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L688" class="LineNr">688 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L689" class="LineNr">689 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L690" class="LineNr">690 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L691" class="LineNr">691 </span>      <span class="Constant">&quot;  81     3b                          07 0b 0c 0d \n&quot;</span>  <span class="Comment">// compare 0x0d0c0b07 with *EBX</span>
+<span id="L692" class="LineNr">692 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 111 (compare imm32) 011 (dest EBX)</span>
+<span id="L693" class="LineNr">693 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L694" class="LineNr">694 </span>      <span class="Constant">&quot;0a 0b 0c 0d\n&quot;</span>  <span class="Comment">// 0x0d0c0b0a</span>
+<span id="L695" class="LineNr">695 </span>  <span class="Delimiter">);</span>
+<span id="L696" class="LineNr">696 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L697" class="LineNr">697 </span>      <span class="Constant">&quot;run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32\n&quot;</span>
+<span id="L698" class="LineNr">698 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EBX)\n&quot;</span>
+<span id="L699" class="LineNr">699 </span>      <span class="Constant">&quot;run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b07\n&quot;</span>
+<span id="L700" class="LineNr">700 </span>      <span class="Constant">&quot;run: SF=0; ZF=0; OF=0\n&quot;</span>
+<span id="L701" class="LineNr">701 </span>  <span class="Delimiter">);</span>
+<span id="L702" class="LineNr">702 </span><span class="Delimiter">}</span>
+<span id="L703" class="LineNr">703 </span>
+<span id="L704" class="LineNr">704 </span><span class="Delimiter">:(code)</span>
+<span id="L705" class="LineNr">705 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L705'>test_compare_imm32_with_mem_at_r32_lesser</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L706" class="LineNr">706 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L707" class="LineNr">707 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L708" class="LineNr">708 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L709" class="LineNr">709 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L710" class="LineNr">710 </span>      <span class="Constant">&quot;  81     3b                          0a 0b 0c 0d \n&quot;</span>  <span class="Comment">// compare 0x0d0c0b0a with *EBX</span>
+<span id="L711" class="LineNr">711 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 111 (compare imm32) 011 (dest EBX)</span>
+<span id="L712" class="LineNr">712 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L713" class="LineNr">713 </span>      <span class="Constant">&quot;07 0b 0c 0d\n&quot;</span>  <span class="Comment">// 0x0d0c0b07</span>
+<span id="L714" class="LineNr">714 </span>  <span class="Delimiter">);</span>
+<span id="L715" class="LineNr">715 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L716" class="LineNr">716 </span>      <span class="Constant">&quot;run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32\n&quot;</span>
+<span id="L717" class="LineNr">717 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EBX)\n&quot;</span>
+<span id="L718" class="LineNr">718 </span>      <span class="Constant">&quot;run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a\n&quot;</span>
+<span id="L719" class="LineNr">719 </span>      <span class="Constant">&quot;run: SF=1; ZF=0; OF=0\n&quot;</span>
+<span id="L720" class="LineNr">720 </span>  <span class="Delimiter">);</span>
+<span id="L721" class="LineNr">721 </span><span class="Delimiter">}</span>
+<span id="L722" class="LineNr">722 </span>
+<span id="L723" class="LineNr">723 </span><span class="Delimiter">:(code)</span>
+<span id="L724" class="LineNr">724 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L724'>test_compare_imm32_with_mem_at_r32_equal</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L725" class="LineNr">725 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x0d0c0b0a</span><span class="Delimiter">;</span>
+<span id="L726" class="LineNr">726 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L727" class="LineNr">727 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L728" class="LineNr">728 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L729" class="LineNr">729 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L730" class="LineNr">730 </span>      <span class="Constant">&quot;  81     3b                          0a 0b 0c 0d \n&quot;</span>  <span class="Comment">// compare 0x0d0c0b0a with *EBX</span>
+<span id="L731" class="LineNr">731 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 111 (compare imm32) 011 (dest EBX)</span>
+<span id="L732" class="LineNr">732 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L733" class="LineNr">733 </span>      <span class="Constant">&quot;0a 0b 0c 0d\n&quot;</span>  <span class="Comment">// 0x0d0c0b0a</span>
+<span id="L734" class="LineNr">734 </span>  <span class="Delimiter">);</span>
+<span id="L735" class="LineNr">735 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L736" class="LineNr">736 </span>      <span class="Constant">&quot;run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32\n&quot;</span>
+<span id="L737" class="LineNr">737 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EBX)\n&quot;</span>
+<span id="L738" class="LineNr">738 </span>      <span class="Constant">&quot;run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a\n&quot;</span>
+<span id="L739" class="LineNr">739 </span>      <span class="Constant">&quot;run: SF=0; ZF=1; OF=0\n&quot;</span>
+<span id="L740" class="LineNr">740 </span>  <span class="Delimiter">);</span>
+<span id="L741" class="LineNr">741 </span><span class="Delimiter">}</span>
+<span id="L742" class="LineNr">742 </span>
+<span id="L743" class="LineNr">743 </span><span class="SalientComment">//:: copy (mov)</span>
+<span id="L744" class="LineNr">744 </span>
+<span id="L745" class="LineNr">745 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L746" class="LineNr">746 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;b8&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='037heap.cc.html#L23'>imm32</a> to <a href='010---vm.cc.html#L13'>EAX</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L747" class="LineNr">747 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;b9&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='037heap.cc.html#L23'>imm32</a> to <a href='010---vm.cc.html#L14'>ECX</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L748" class="LineNr">748 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;ba&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='037heap.cc.html#L23'>imm32</a> to <a href='010---vm.cc.html#L15'>EDX</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L749" class="LineNr">749 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bb&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='037heap.cc.html#L23'>imm32</a> to <a href='010---vm.cc.html#L16'>EBX</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L750" class="LineNr">750 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bc&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='037heap.cc.html#L23'>imm32</a> to <a href='010---vm.cc.html#L17'>ESP</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L751" class="LineNr">751 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bd&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='037heap.cc.html#L23'>imm32</a> to <a href='010---vm.cc.html#L18'>EBP</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L752" class="LineNr">752 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;be&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='037heap.cc.html#L23'>imm32</a> to <a href='010---vm.cc.html#L19'>ESI</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L753" class="LineNr">753 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bf&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='037heap.cc.html#L23'>imm32</a> to <a href='010---vm.cc.html#L20'>EDI</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L754" class="LineNr">754 </span>
+<span id="L755" class="LineNr">755 </span><span class="Delimiter">:(code)</span>
+<span id="L756" class="LineNr">756 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L756'>test_copy_imm32_to_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L757" class="LineNr">757 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L758" class="LineNr">758 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L759" class="LineNr">759 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L760" class="LineNr">760 </span>      <span class="Constant">&quot;  bb                                 0a 0b 0c 0d \n&quot;</span>  <span class="Comment">// copy 0x0d0c0b0a to EBX</span>
+<span id="L761" class="LineNr">761 </span>  <span class="Delimiter">);</span>
+<span id="L762" class="LineNr">762 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L763" class="LineNr">763 </span>      <span class="Constant">&quot;run: copy <a href='037heap.cc.html#L23'>imm32</a> 0x0d0c0b0a to EBX\n&quot;</span>
+<span id="L764" class="LineNr">764 </span>  <span class="Delimiter">);</span>
+<span id="L765" class="LineNr">765 </span><span class="Delimiter">}</span>
+<span id="L766" class="LineNr">766 </span>
+<span id="L767" class="LineNr">767 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L768" class="LineNr">768 </span><span class="Normal">case</span> <span class="Constant">0xb8</span>:
+<span id="L769" class="LineNr">769 </span><span class="Normal">case</span> <span class="Constant">0xb9</span>:
+<span id="L770" class="LineNr">770 </span><span class="Normal">case</span> <span class="Constant">0xba</span>:
+<span id="L771" class="LineNr">771 </span><span class="Normal">case</span> <span class="Constant">0xbb</span>:
+<span id="L772" class="LineNr">772 </span><span class="Normal">case</span> <span class="Constant">0xbc</span>:
+<span id="L773" class="LineNr">773 </span><span class="Normal">case</span> <span class="Constant">0xbd</span>:
+<span id="L774" class="LineNr">774 </span><span class="Normal">case</span> <span class="Constant">0xbe</span>:
+<span id="L775" class="LineNr">775 </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="L776" class="LineNr">776 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> rdest = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L777" class="LineNr">777 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> src = <a href='011run.cc.html#L366'>next32</a><span class="Delimiter">();</span>
+<span id="L778" class="LineNr">778 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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='037heap.cc.html#L23'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; src &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L73'>rname</a><span class="Delimiter">(</span>rdest<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L779" class="LineNr">779 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rdest]<span class="Delimiter">.</span>i = src<span class="Delimiter">;</span>
+<span id="L780" class="LineNr">780 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L781" class="LineNr">781 </span><span class="Delimiter">}</span>
+<span id="L782" class="LineNr">782 </span>
+<span id="L783" class="LineNr">783 </span><span class="Comment">//:</span>
+<span id="L784" class="LineNr">784 </span>
+<span id="L785" class="LineNr">785 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L786" class="LineNr">786 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='037heap.cc.html#L23'>imm32</a> to rm32 (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L787" class="LineNr">787 </span>
+<span id="L788" class="LineNr">788 </span><span class="Delimiter">:(code)</span>
+<span id="L789" class="LineNr">789 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L789'>test_copy_imm32_to_mem_at_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L790" class="LineNr">790 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x60</span><span class="Delimiter">;</span>
+<span id="L791" class="LineNr">791 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L792" class="LineNr">792 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L793" class="LineNr">793 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L794" class="LineNr">794 </span>      <span class="Constant">&quot;  c7     03                          0a 0b 0c 0d \n&quot;</span>  <span class="Comment">// copy 0x0d0c0b0a to *EBX</span>
+<span id="L795" class="LineNr">795 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 000 (unused) 011 (dest EBX)</span>
+<span id="L796" class="LineNr">796 </span>  <span class="Delimiter">);</span>
+<span id="L797" class="LineNr">797 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L798" class="LineNr">798 </span>      <span class="Constant">&quot;run: copy <a href='037heap.cc.html#L23'>imm32</a> to r/m32\n&quot;</span>
+<span id="L799" class="LineNr">799 </span>      <span class="Constant">&quot;run: effective address is 0x00000060 (EBX)\n&quot;</span>
+<span id="L800" class="LineNr">800 </span>      <span class="Constant">&quot;run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a\n&quot;</span>
+<span id="L801" class="LineNr">801 </span>  <span class="Delimiter">);</span>
+<span id="L802" class="LineNr">802 </span><span class="Delimiter">}</span>
+<span id="L803" class="LineNr">803 </span>
+<span id="L804" class="LineNr">804 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L805" class="LineNr">805 </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="L806" class="LineNr">806 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
+<span id="L807" class="LineNr">807 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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='037heap.cc.html#L23'>imm32</a> to r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L808" class="LineNr">808 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
+<span id="L809" class="LineNr">809 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>subop != <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L810" class="LineNr">810 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized subop for opcode c7: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; (only 0/copy currently implemented)\n&quot;</span><span class="Delimiter">;</span>
+<span id="L811" class="LineNr">811 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L812" class="LineNr">812 </span>  <span class="Delimiter">}</span>
+<span id="L813" class="LineNr">813 </span>  <span class="Normal">int32_t</span>* dest = <a href='013direct_addressing.cc.html#L38'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L814" class="LineNr">814 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> src = <a href='011run.cc.html#L366'>next32</a><span class="Delimiter">();</span>
+<span id="L815" class="LineNr">815 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;imm32 is 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; src &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L816" class="LineNr">816 </span>  *dest = src<span class="Delimiter">;</span>
+<span id="L817" class="LineNr">817 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L818" class="LineNr">818 </span><span class="Delimiter">}</span>
+<span id="L819" class="LineNr">819 </span>
+<span id="L820" class="LineNr">820 </span><span class="SalientComment">//:: push</span>
+<span id="L821" class="LineNr">821 </span>
+<span id="L822" class="LineNr">822 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L823" class="LineNr">823 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;68&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='037heap.cc.html#L23'>imm32</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L824" class="LineNr">824 </span>
+<span id="L825" class="LineNr">825 </span><span class="Delimiter">:(code)</span>
+<span id="L826" class="LineNr">826 </span><span class="Normal">void</span> <a href='015immediate_addressing.cc.html#L826'>test_push_imm32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L827" class="LineNr">827 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u = <span class="Constant">0x14</span><span class="Delimiter">;</span>
+<span id="L828" class="LineNr">828 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L829" class="LineNr">829 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L830" class="LineNr">830 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L831" class="LineNr">831 </span>      <span class="Constant">&quot;  68                                 af 00 00 00 \n&quot;</span>  <span class="Comment">// push *EAX to stack</span>
+<span id="L832" class="LineNr">832 </span>  <span class="Delimiter">);</span>
+<span id="L833" class="LineNr">833 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L834" class="LineNr">834 </span>      <span class="Constant">&quot;run: <a href='012elf.cc.html#L90'>push</a> <a href='037heap.cc.html#L23'>imm32</a> 0x000000af\n&quot;</span>
+<span id="L835" class="LineNr">835 </span>      <span class="Constant">&quot;run: <a href='010---vm.cc.html#L17'>ESP</a> is now 0x00000010\n&quot;</span>
+<span id="L836" class="LineNr">836 </span>      <span class="Constant">&quot;run: <a href='003trace.cc.html#L117'>contents</a> at <a href='010---vm.cc.html#L17'>ESP</a>: 0x000000af\n&quot;</span>
+<span id="L837" class="LineNr">837 </span>  <span class="Delimiter">);</span>
+<span id="L838" class="LineNr">838 </span><span class="Delimiter">}</span>
+<span id="L839" class="LineNr">839 </span>
+<span id="L840" class="LineNr">840 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L841" class="LineNr">841 </span><span class="Normal">case</span> <span class="Constant">0x68</span>: <span class="Delimiter">{</span>
+<span id="L842" class="LineNr">842 </span>  <span class="Normal">const</span> <span class="Normal">uint32_t</span> val = <span class="Normal">static_cast</span>&lt;<span class="Normal">uint32_t</span>&gt;<span class="Delimiter">(</span><a href='011run.cc.html#L366'>next32</a><span class="Delimiter">());</span>
+<span id="L843" class="LineNr">843 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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='037heap.cc.html#L23'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; val &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L844" class="LineNr">844 </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="L845" class="LineNr">845 </span>  <a href='012elf.cc.html#L90'>push</a><span class="Delimiter">(</span>val<span class="Delimiter">);</span>
+<span id="L846" class="LineNr">846 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L440'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L847" class="LineNr">847 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L440'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L209'>read_mem_u32</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L848" class="LineNr">848 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L849" class="LineNr">849 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/016index_addressing.cc.html b/html/subx/016index_addressing.cc.html
index 03d4dbf0..dc4451cf 100644
--- a/html/subx/016index_addressing.cc.html
+++ b/html/subx/016index_addressing.cc.html
@@ -14,8 +14,6 @@ pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-
 body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
-.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
-.traceContains { color: #005f00; }
 .LineNr { }
 .Constant { color: #008787; }
 .Delimiter { color: #c000c0; }
@@ -23,7 +21,6 @@ a { color:inherit; }
 .Identifier { color: #af5f00; }
 .Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 .Comment { color: #005faf; }
-.PreProc { color: #c000c0; }
 -->
 </style>
 
@@ -61,129 +58,159 @@ if ('onhashchange' in window) {
 <pre id='vimCodeElement'>
 <span id="L1" class="LineNr">  1 </span><span class="Comment">//: operating on memory at the address provided by some register plus optional scale and offset</span>
 <span id="L2" class="LineNr">  2 </span>
-<span id="L3" class="LineNr">  3 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32_with_sib)</span>
-<span id="L4" class="LineNr">  4 </span><span class="Special">% Reg[EBX].i = 0x10;</span>
-<span id="L5" class="LineNr">  5 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
-<span id="L6" class="LineNr">  6 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L7" class="LineNr">  7 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L8" class="LineNr">  8 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  1c      <span class="Constant">20</span>                             <span class="Comment"># add EBX to *EAX</span>
-<span id="L9" class="LineNr">  9 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EBX) 100 (dest in SIB)</span>
-<span id="L10" class="LineNr"> 10 </span><span class="Comment"># SIB in binary: 00 (scale 1) 100 (no index) 000 (base EAX)</span>
-<span id="L11" class="LineNr"> 11 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L12" class="LineNr"> 12 </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="L13" class="LineNr"> 13 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L14" class="LineNr"> 14 </span><span class="traceContains">+run: effective address is initially 0x00002000 (EAX)</span>
-<span id="L15" class="LineNr"> 15 </span><span class="traceContains">+run: effective address is 0x00002000</span>
-<span id="L16" class="LineNr"> 16 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L17" class="LineNr"> 17 </span>
-<span id="L18" class="LineNr"> 18 </span><span class="Delimiter">:(before &quot;End Mod 0 Special-cases(addr)&quot;)</span>
-<span id="L19" class="LineNr"> 19 </span><span class="Normal">case</span> <span class="Constant">4</span>:  <span class="Comment">// exception: mod 0b00 rm 0b100 =&gt; incoming SIB (scale-index-base) byte</span>
-<span id="L20" class="LineNr"> 20 </span>  addr = <a href='016index_addressing.cc.html#L23'>effective_address_from_sib</a><span class="Delimiter">(</span>mod<span class="Delimiter">);</span>
-<span id="L21" class="LineNr"> 21 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L22" class="LineNr"> 22 </span><span class="Delimiter">:(code)</span>
-<span id="L23" class="LineNr"> 23 </span><span class="Normal">uint32_t</span> <a href='016index_addressing.cc.html#L23'>effective_address_from_sib</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> mod<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L24" class="LineNr"> 24 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> sib = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L25" class="LineNr"> 25 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> base = sib&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L26" class="LineNr"> 26 </span>  <span class="Normal">uint32_t</span> addr = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L27" class="LineNr"> 27 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>base != <a href='010---vm.cc.html#L18'>EBP</a> || mod != <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L28" class="LineNr"> 28 </span>    addr = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[base]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L29" class="LineNr"> 29 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L63'>rname</a><span class="Delimiter">(</span>base<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<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#L336'>next32</a><span class="Delimiter">();</span>  <span class="Comment">// ignore base</span>
-<span id="L34" class="LineNr"> 34 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (disp32)&quot;</span> &lt;&lt; end<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">const</span> <span class="Normal">uint8_t</span> index = <span class="Delimiter">(</span>sib&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L37" class="LineNr"> 37 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>index == <a href='010---vm.cc.html#L17'>ESP</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L38" class="LineNr"> 38 </span>    <span class="Comment">// ignore index and scale</span>
-<span id="L39" class="LineNr"> 39 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; addr &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L40" class="LineNr"> 40 </span>  <span class="Delimiter">}</span>
-<span id="L41" class="LineNr"> 41 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L42" class="LineNr"> 42 </span>    <span class="Normal">const</span> <span class="Normal">uint8_t</span> scale = <span class="Delimiter">(</span><span class="Constant">1</span> &lt;&lt; <span class="Delimiter">(</span>sib&gt;&gt;<span class="Constant">6</span><span class="Delimiter">));</span>
-<span id="L43" class="LineNr"> 43 </span>    addr += <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[index]<span class="Delimiter">.</span>i*scale<span class="Delimiter">;</span>  <span class="Comment">// treat index register as signed. Maybe base as well? But we'll always ensure it's non-negative.</span>
-<span id="L44" class="LineNr"> 44 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L63'>rname</a><span class="Delimiter">(</span>index<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;*&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>scale<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L45" class="LineNr"> 45 </span>  <span class="Delimiter">}</span>
-<span id="L46" class="LineNr"> 46 </span>  <span class="Identifier">return</span> addr<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="Delimiter">:(scenario add_r32_to_mem_at_base_r32_index_r32)</span>
-<span id="L50" class="LineNr"> 50 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
-<span id="L51" class="LineNr"> 51 </span><span class="Special">% Reg[EAX].i = 0x1ffe;  // dest base</span>
-<span id="L52" class="LineNr"> 52 </span><span class="Special">% Reg[ECX].i = 0x2;  // dest index</span>
-<span id="L53" class="LineNr"> 53 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L54" class="LineNr"> 54 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L55" class="LineNr"> 55 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  1c      <span class="Error">08</span>                             <span class="Comment"># add EBX to *(EAX+ECX)</span>
-<span id="L56" class="LineNr"> 56 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EBX) 100 (dest in SIB)</span>
-<span id="L57" class="LineNr"> 57 </span><span class="Comment"># SIB in binary: 00 (scale 1) 001 (index ECX) 000 (base EAX)</span>
-<span id="L58" class="LineNr"> 58 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L59" class="LineNr"> 59 </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="L60" class="LineNr"> 60 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L61" class="LineNr"> 61 </span><span class="traceContains">+run: effective address is initially 0x00001ffe (EAX)</span>
-<span id="L62" class="LineNr"> 62 </span><span class="traceContains">+run: effective address is 0x00002000 (after adding ECX*1)</span>
-<span id="L63" class="LineNr"> 63 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L64" class="LineNr"> 64 </span>
-<span id="L65" class="LineNr"> 65 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_displacement_using_sib)</span>
-<span id="L66" class="LineNr"> 66 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
-<span id="L67" class="LineNr"> 67 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L68" class="LineNr"> 68 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L69" class="LineNr"> 69 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  1c      <span class="Constant">25</span>    <span class="PreProc">0</span><span class="Constant">0</span> <span class="Constant">20</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 *0x2000</span>
-<span id="L70" class="LineNr"> 70 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EBX) 100 (dest in SIB)</span>
-<span id="L71" class="LineNr"> 71 </span><span class="Comment"># SIB in binary: 00 (scale 1) 100 (no index) 101 (not EBP but disp32)</span>
-<span id="L72" class="LineNr"> 72 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L73" class="LineNr"> 73 </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="L74" class="LineNr"> 74 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L75" class="LineNr"> 75 </span><span class="traceContains">+run: effective address is initially 0x00002000 (disp32)</span>
-<span id="L76" class="LineNr"> 76 </span><span class="traceContains">+run: effective address is 0x00002000</span>
-<span id="L77" class="LineNr"> 77 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L78" class="LineNr"> 78 </span>
-<span id="L79" class="LineNr"> 79 </span><span class="Comment">//:</span>
-<span id="L80" class="LineNr"> 80 </span>
-<span id="L81" class="LineNr"> 81 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_base_r32_index_r32_plus_disp8)</span>
-<span id="L82" class="LineNr"> 82 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
-<span id="L83" class="LineNr"> 83 </span><span class="Special">% Reg[EAX].i = 0x1ff9;  // dest base</span>
-<span id="L84" class="LineNr"> 84 </span><span class="Special">% Reg[ECX].i = 0x5;  // dest index</span>
-<span id="L85" class="LineNr"> 85 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L86" class="LineNr"> 86 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L87" class="LineNr"> 87 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  5c      <span class="Error">08</span>    <span class="PreProc">0</span><span class="Constant">2</span>                       <span class="Comment"># add EBX to *(EAX+ECX+2)</span>
-<span id="L88" class="LineNr"> 88 </span><span class="Comment"># ModR/M in binary: 01 (indirect+disp8 mode) 011 (src EBX) 100 (dest in SIB)</span>
-<span id="L89" class="LineNr"> 89 </span><span class="Comment"># SIB in binary: 00 (scale 1) 001 (index ECX) 000 (base EAX)</span>
-<span id="L90" class="LineNr"> 90 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L91" class="LineNr"> 91 </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="L92" class="LineNr"> 92 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L93" class="LineNr"> 93 </span><span class="traceContains">+run: effective address is initially 0x00001ff9 (EAX)</span>
-<span id="L94" class="LineNr"> 94 </span><span class="traceContains">+run: effective address is 0x00001ffe (after adding ECX*1)</span>
-<span id="L95" class="LineNr"> 95 </span><span class="traceContains">+run: effective address is 0x00002000 (after adding disp8)</span>
-<span id="L96" class="LineNr"> 96 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L97" class="LineNr"> 97 </span>
-<span id="L98" class="LineNr"> 98 </span><span class="Delimiter">:(before &quot;End Mod 1 Special-cases(addr)&quot;)</span>
-<span id="L99" class="LineNr"> 99 </span><span class="Normal">case</span> <span class="Constant">4</span>:  <span class="Comment">// exception: mod 0b01 rm 0b100 =&gt; incoming SIB (scale-index-base) byte</span>
-<span id="L100" class="LineNr">100 </span>  addr = <a href='016index_addressing.cc.html#L23'>effective_address_from_sib</a><span class="Delimiter">(</span>mod<span class="Delimiter">);</span>
-<span id="L101" class="LineNr">101 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L102" class="LineNr">102 </span>
-<span id="L103" class="LineNr">103 </span><span class="Comment">//:</span>
-<span id="L104" class="LineNr">104 </span>
-<span id="L105" class="LineNr">105 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_base_r32_index_r32_plus_disp32)</span>
-<span id="L106" class="LineNr">106 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
-<span id="L107" class="LineNr">107 </span><span class="Special">% Reg[EAX].i = 0x1ff9;  // dest base</span>
-<span id="L108" class="LineNr">108 </span><span class="Special">% Reg[ECX].i = 0x5;  // dest index</span>
-<span id="L109" class="LineNr">109 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L110" class="LineNr">110 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L111" class="LineNr">111 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  9c      <span class="Error">08</span>    <span class="PreProc">0</span><span class="Constant">2</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>              <span class="Comment"># add EBX to *(EAX+ECX+2)</span>
-<span id="L112" class="LineNr">112 </span><span class="Comment"># ModR/M in binary: 10 (indirect+disp32 mode) 011 (src EBX) 100 (dest in SIB)</span>
-<span id="L113" class="LineNr">113 </span><span class="Comment"># SIB in binary: 00 (scale 1) 001 (index ECX) 000 (base EAX)</span>
-<span id="L114" class="LineNr">114 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L115" class="LineNr">115 </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="L116" class="LineNr">116 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L117" class="LineNr">117 </span><span class="traceContains">+run: effective address is initially 0x00001ff9 (EAX)</span>
-<span id="L118" class="LineNr">118 </span><span class="traceContains">+run: effective address is 0x00001ffe (after adding ECX*1)</span>
-<span id="L119" class="LineNr">119 </span><span class="traceContains">+run: effective address is 0x00002000 (after adding disp32)</span>
-<span id="L120" class="LineNr">120 </span><span class="traceContains">+run: storing 0x00000011</span>
+<span id="L3" class="LineNr">  3 </span><span class="Delimiter">:(code)</span>
+<span id="L4" class="LineNr">  4 </span><span class="Normal">void</span> <a href='016index_addressing.cc.html#L4'>test_add_r32_to_mem_at_r32_with_sib</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L5" class="LineNr">  5 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x10</span><span class="Delimiter">;</span>
+<span id="L6" class="LineNr">  6 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L7" class="LineNr">  7 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L8" class="LineNr">  8 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<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">&quot;  01     1c      20                              \n&quot;</span>  <span class="Comment">// add EBX to *EAX</span>
+<span id="L11" class="LineNr"> 11 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 011 (src EBX) 100 (dest in SIB)</span>
+<span id="L12" class="LineNr"> 12 </span>      <span class="Comment">// SIB in binary: 00 (scale 1) 100 (no index) 000 (base EAX)</span>
+<span id="L13" class="LineNr"> 13 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L14" class="LineNr"> 14 </span>      <span class="Constant">&quot;01 00 00 00\n&quot;</span>  <span class="Comment">// 0x00000001</span>
+<span id="L15" class="LineNr"> 15 </span>  <span class="Delimiter">);</span>
+<span id="L16" class="LineNr"> 16 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L17" class="LineNr"> 17 </span>      <span class="Constant">&quot;run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32\n&quot;</span>
+<span id="L18" class="LineNr"> 18 </span>      <span class="Constant">&quot;run: effective address is initially 0x00002000 (EAX)\n&quot;</span>
+<span id="L19" class="LineNr"> 19 </span>      <span class="Constant">&quot;run: effective address is 0x00002000\n&quot;</span>
+<span id="L20" class="LineNr"> 20 </span>      <span class="Constant">&quot;run: storing 0x00000011\n&quot;</span>
+<span id="L21" class="LineNr"> 21 </span>  <span class="Delimiter">);</span>
+<span id="L22" class="LineNr"> 22 </span><span class="Delimiter">}</span>
+<span id="L23" class="LineNr"> 23 </span>
+<span id="L24" class="LineNr"> 24 </span><span class="Delimiter">:(before &quot;End Mod 0 Special-cases(addr)&quot;)</span>
+<span id="L25" class="LineNr"> 25 </span><span class="Normal">case</span> <span class="Constant">4</span>:  <span class="Comment">// exception: mod 0b00 rm 0b100 =&gt; incoming SIB (scale-index-base) byte</span>
+<span id="L26" class="LineNr"> 26 </span>  addr = <a href='016index_addressing.cc.html#L29'>effective_address_from_sib</a><span class="Delimiter">(</span>mod<span class="Delimiter">);</span>
+<span id="L27" class="LineNr"> 27 </span>  <span class="Identifier">break</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">uint32_t</span> <a href='016index_addressing.cc.html#L29'>effective_address_from_sib</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> mod<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L30" class="LineNr"> 30 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> sib = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
+<span id="L31" class="LineNr"> 31 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> base = sib&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L32" class="LineNr"> 32 </span>  <span class="Normal">uint32_t</span> addr = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L33" class="LineNr"> 33 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>base != <a href='010---vm.cc.html#L18'>EBP</a> || mod != <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L34" class="LineNr"> 34 </span>    addr = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[base]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
+<span id="L35" class="LineNr"> 35 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L73'>rname</a><span class="Delimiter">(</span>base<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L36" class="LineNr"> 36 </span>  <span class="Delimiter">}</span>
+<span id="L37" class="LineNr"> 37 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L38" class="LineNr"> 38 </span>    <span class="Comment">// base == EBP &amp;&amp; mod == 0</span>
+<span id="L39" class="LineNr"> 39 </span>    addr = <a href='011run.cc.html#L366'>next32</a><span class="Delimiter">();</span>  <span class="Comment">// ignore base</span>
+<span id="L40" class="LineNr"> 40 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (disp32)&quot;</span> &lt;&lt; end<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">const</span> <span class="Normal">uint8_t</span> index = <span class="Delimiter">(</span>sib&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L43" class="LineNr"> 43 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>index == <a href='010---vm.cc.html#L17'>ESP</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L44" class="LineNr"> 44 </span>    <span class="Comment">// ignore index and scale</span>
+<span id="L45" class="LineNr"> 45 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; addr &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L46" class="LineNr"> 46 </span>  <span class="Delimiter">}</span>
+<span id="L47" class="LineNr"> 47 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L48" class="LineNr"> 48 </span>    <span class="Normal">const</span> <span class="Normal">uint8_t</span> scale = <span class="Delimiter">(</span><span class="Constant">1</span> &lt;&lt; <span class="Delimiter">(</span>sib&gt;&gt;<span class="Constant">6</span><span class="Delimiter">));</span>
+<span id="L49" class="LineNr"> 49 </span>    addr += <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[index]<span class="Delimiter">.</span>i*scale<span class="Delimiter">;</span>  <span class="Comment">// treat index register as signed. Maybe base as well? But we'll always ensure it's non-negative.</span>
+<span id="L50" class="LineNr"> 50 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L73'>rname</a><span class="Delimiter">(</span>index<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;*&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span>scale<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L51" class="LineNr"> 51 </span>  <span class="Delimiter">}</span>
+<span id="L52" class="LineNr"> 52 </span>  <span class="Identifier">return</span> addr<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="Delimiter">:(code)</span>
+<span id="L56" class="LineNr"> 56 </span><span class="Normal">void</span> <a href='016index_addressing.cc.html#L56'>test_add_r32_to_mem_at_base_r32_index_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L57" class="LineNr"> 57 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x10</span><span class="Delimiter">;</span>  <span class="Comment">// source</span>
+<span id="L58" class="LineNr"> 58 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x1ffe</span><span class="Delimiter">;</span>  <span class="Comment">// dest base</span>
+<span id="L59" class="LineNr"> 59 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>i = <span class="Constant">0x2</span><span class="Delimiter">;</span>  <span class="Comment">// dest index</span>
+<span id="L60" class="LineNr"> 60 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L61" class="LineNr"> 61 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L62" class="LineNr"> 62 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L63" class="LineNr"> 63 </span>      <span class="Constant">&quot;  01     1c      08                              \n&quot;</span>  <span class="Comment">// add EBX to *(EAX+ECX)</span>
+<span id="L64" class="LineNr"> 64 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 011 (src EBX) 100 (dest in SIB)</span>
+<span id="L65" class="LineNr"> 65 </span>      <span class="Comment">// SIB in binary: 00 (scale 1) 001 (index ECX) 000 (base EAX)</span>
+<span id="L66" class="LineNr"> 66 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L67" class="LineNr"> 67 </span>      <span class="Constant">&quot;01 00 00 00\n&quot;</span>  <span class="Comment">// 0x00000001</span>
+<span id="L68" class="LineNr"> 68 </span>  <span class="Delimiter">);</span>
+<span id="L69" class="LineNr"> 69 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L70" class="LineNr"> 70 </span>      <span class="Constant">&quot;run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32\n&quot;</span>
+<span id="L71" class="LineNr"> 71 </span>      <span class="Constant">&quot;run: effective address is initially 0x00001ffe (EAX)\n&quot;</span>
+<span id="L72" class="LineNr"> 72 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (after adding ECX*1)\n&quot;</span>
+<span id="L73" class="LineNr"> 73 </span>      <span class="Constant">&quot;run: storing 0x00000011\n&quot;</span>
+<span id="L74" class="LineNr"> 74 </span>  <span class="Delimiter">);</span>
+<span id="L75" class="LineNr"> 75 </span><span class="Delimiter">}</span>
+<span id="L76" class="LineNr"> 76 </span>
+<span id="L77" class="LineNr"> 77 </span><span class="Delimiter">:(code)</span>
+<span id="L78" class="LineNr"> 78 </span><span class="Normal">void</span> <a href='016index_addressing.cc.html#L78'>test_add_r32_to_mem_at_displacement_using_sib</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L79" class="LineNr"> 79 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x10</span><span class="Delimiter">;</span>  <span class="Comment">// source</span>
+<span id="L80" class="LineNr"> 80 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L81" class="LineNr"> 81 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L82" class="LineNr"> 82 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L83" class="LineNr"> 83 </span>      <span class="Constant">&quot;  01     1c      25    00 20 00 00               \n&quot;</span>  <span class="Comment">// add EBX to *0x2000</span>
+<span id="L84" class="LineNr"> 84 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 011 (src EBX) 100 (dest in SIB)</span>
+<span id="L85" class="LineNr"> 85 </span>      <span class="Comment">// SIB in binary: 00 (scale 1) 100 (no index) 101 (not EBP but disp32)</span>
+<span id="L86" class="LineNr"> 86 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L87" class="LineNr"> 87 </span>      <span class="Constant">&quot;01 00 00 00\n&quot;</span>  <span class="Comment">// 0x00000001</span>
+<span id="L88" class="LineNr"> 88 </span>  <span class="Delimiter">);</span>
+<span id="L89" class="LineNr"> 89 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L90" class="LineNr"> 90 </span>      <span class="Constant">&quot;run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32\n&quot;</span>
+<span id="L91" class="LineNr"> 91 </span>      <span class="Constant">&quot;run: effective address is initially 0x00002000 (disp32)\n&quot;</span>
+<span id="L92" class="LineNr"> 92 </span>      <span class="Constant">&quot;run: effective address is 0x00002000\n&quot;</span>
+<span id="L93" class="LineNr"> 93 </span>      <span class="Constant">&quot;run: storing 0x00000011\n&quot;</span>
+<span id="L94" class="LineNr"> 94 </span>  <span class="Delimiter">);</span>
+<span id="L95" class="LineNr"> 95 </span><span class="Delimiter">}</span>
+<span id="L96" class="LineNr"> 96 </span>
+<span id="L97" class="LineNr"> 97 </span><span class="Comment">//:</span>
+<span id="L98" class="LineNr"> 98 </span>
+<span id="L99" class="LineNr"> 99 </span><span class="Delimiter">:(code)</span>
+<span id="L100" class="LineNr">100 </span><span class="Normal">void</span> <a href='016index_addressing.cc.html#L100'>test_add_r32_to_mem_at_base_r32_index_r32_plus_disp8</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L101" class="LineNr">101 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x10</span><span class="Delimiter">;</span>  <span class="Comment">// source</span>
+<span id="L102" class="LineNr">102 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x1ff9</span><span class="Delimiter">;</span>  <span class="Comment">// dest base</span>
+<span id="L103" class="LineNr">103 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>i = <span class="Constant">0x5</span><span class="Delimiter">;</span>  <span class="Comment">// dest index</span>
+<span id="L104" class="LineNr">104 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L105" class="LineNr">105 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L106" class="LineNr">106 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L107" class="LineNr">107 </span>      <span class="Constant">&quot;  01     5c      08    02                        \n&quot;</span>  <span class="Comment">// add EBX to *(EAX+ECX+2)</span>
+<span id="L108" class="LineNr">108 </span>      <span class="Comment">// ModR/M in binary: 01 (indirect+disp8 mode) 011 (src EBX) 100 (dest in SIB)</span>
+<span id="L109" class="LineNr">109 </span>      <span class="Comment">// SIB in binary: 00 (scale 1) 001 (index ECX) 000 (base EAX)</span>
+<span id="L110" class="LineNr">110 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L111" class="LineNr">111 </span>      <span class="Constant">&quot;01 00 00 00\n&quot;</span>  <span class="Comment">// 0x00000001</span>
+<span id="L112" class="LineNr">112 </span>  <span class="Delimiter">);</span>
+<span id="L113" class="LineNr">113 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L114" class="LineNr">114 </span>      <span class="Constant">&quot;run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32\n&quot;</span>
+<span id="L115" class="LineNr">115 </span>      <span class="Constant">&quot;run: effective address is initially 0x00001ff9 (EAX)\n&quot;</span>
+<span id="L116" class="LineNr">116 </span>      <span class="Constant">&quot;run: effective address is 0x00001ffe (after adding ECX*1)\n&quot;</span>
+<span id="L117" class="LineNr">117 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (after adding disp8)\n&quot;</span>
+<span id="L118" class="LineNr">118 </span>      <span class="Constant">&quot;run: storing 0x00000011\n&quot;</span>
+<span id="L119" class="LineNr">119 </span>  <span class="Delimiter">);</span>
+<span id="L120" class="LineNr">120 </span><span class="Delimiter">}</span>
 <span id="L121" class="LineNr">121 </span>
-<span id="L122" class="LineNr">122 </span><span class="Delimiter">:(before &quot;End Mod 2 Special-cases(addr)&quot;)</span>
-<span id="L123" class="LineNr">123 </span><span class="Normal">case</span> <span class="Constant">4</span>:  <span class="Comment">// exception: mod 0b10 rm 0b100 =&gt; incoming SIB (scale-index-base) byte</span>
-<span id="L124" class="LineNr">124 </span>  addr = <a href='016index_addressing.cc.html#L23'>effective_address_from_sib</a><span class="Delimiter">(</span>mod<span class="Delimiter">);</span>
+<span id="L122" class="LineNr">122 </span><span class="Delimiter">:(before &quot;End Mod 1 Special-cases(addr)&quot;)</span>
+<span id="L123" class="LineNr">123 </span><span class="Normal">case</span> <span class="Constant">4</span>:  <span class="Comment">// exception: mod 0b01 rm 0b100 =&gt; incoming SIB (scale-index-base) byte</span>
+<span id="L124" class="LineNr">124 </span>  addr = <a href='016index_addressing.cc.html#L29'>effective_address_from_sib</a><span class="Delimiter">(</span>mod<span class="Delimiter">);</span>
 <span id="L125" class="LineNr">125 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L126" class="LineNr">126 </span>
+<span id="L127" class="LineNr">127 </span><span class="Comment">//:</span>
+<span id="L128" class="LineNr">128 </span>
+<span id="L129" class="LineNr">129 </span><span class="Delimiter">:(code)</span>
+<span id="L130" class="LineNr">130 </span><span class="Normal">void</span> <a href='016index_addressing.cc.html#L130'>test_add_r32_to_mem_at_base_r32_index_r32_plus_disp32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L131" class="LineNr">131 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x10</span><span class="Delimiter">;</span>  <span class="Comment">// source</span>
+<span id="L132" class="LineNr">132 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x1ff9</span><span class="Delimiter">;</span>  <span class="Comment">// dest base</span>
+<span id="L133" class="LineNr">133 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>i = <span class="Constant">0x5</span><span class="Delimiter">;</span>  <span class="Comment">// dest index</span>
+<span id="L134" class="LineNr">134 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L135" class="LineNr">135 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L136" class="LineNr">136 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L137" class="LineNr">137 </span>      <span class="Constant">&quot;  01     9c      08    02 00 00 00               \n&quot;</span>  <span class="Comment">// add EBX to *(EAX+ECX+2)</span>
+<span id="L138" class="LineNr">138 </span>      <span class="Comment">// ModR/M in binary: 10 (indirect+disp32 mode) 011 (src EBX) 100 (dest in SIB)</span>
+<span id="L139" class="LineNr">139 </span>      <span class="Comment">// SIB in binary: 00 (scale 1) 001 (index ECX) 000 (base EAX)</span>
+<span id="L140" class="LineNr">140 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L141" class="LineNr">141 </span>      <span class="Constant">&quot;01 00 00 00\n&quot;</span>  <span class="Comment">// 0x00000001</span>
+<span id="L142" class="LineNr">142 </span>  <span class="Delimiter">);</span>
+<span id="L143" class="LineNr">143 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L144" class="LineNr">144 </span>      <span class="Constant">&quot;run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32\n&quot;</span>
+<span id="L145" class="LineNr">145 </span>      <span class="Constant">&quot;run: effective address is initially 0x00001ff9 (EAX)\n&quot;</span>
+<span id="L146" class="LineNr">146 </span>      <span class="Constant">&quot;run: effective address is 0x00001ffe (after adding ECX*1)\n&quot;</span>
+<span id="L147" class="LineNr">147 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (after adding disp32)\n&quot;</span>
+<span id="L148" class="LineNr">148 </span>      <span class="Constant">&quot;run: storing 0x00000011\n&quot;</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="Delimiter">:(before &quot;End Mod 2 Special-cases(addr)&quot;)</span>
+<span id="L153" class="LineNr">153 </span><span class="Normal">case</span> <span class="Constant">4</span>:  <span class="Comment">// exception: mod 0b10 rm 0b100 =&gt; incoming SIB (scale-index-base) byte</span>
+<span id="L154" class="LineNr">154 </span>  addr = <a href='016index_addressing.cc.html#L29'>effective_address_from_sib</a><span class="Delimiter">(</span>mod<span class="Delimiter">);</span>
+<span id="L155" class="LineNr">155 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/017jump_disp8.cc.html b/html/subx/017jump_disp8.cc.html
index 5f6a59c2..a53e6329 100644
--- a/html/subx/017jump_disp8.cc.html
+++ b/html/subx/017jump_disp8.cc.html
@@ -14,9 +14,6 @@ pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-
 body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
-.traceAbsent { color: #c00000; }
-.traceContains { color: #005f00; }
-.PreProc { color: #c000c0; }
 .LineNr { }
 .Constant { color: #008787; }
 .Delimiter { color: #c000c0; }
@@ -65,288 +62,372 @@ if ('onhashchange' in window) {
 <span id="L3" class="LineNr">  3 </span><span class="SalientComment">//:: jump</span>
 <span id="L4" class="LineNr">  4 </span>
 <span id="L5" class="LineNr">  5 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L6" class="LineNr">  6 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;eb&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away (jmp)&quot;</span><span class="Delimiter">);</span>
+<span id="L6" class="LineNr">  6 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;eb&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away (jmp)&quot;</span><span class="Delimiter">);</span>
 <span id="L7" class="LineNr">  7 </span>
-<span id="L8" class="LineNr">  8 </span><span class="Delimiter">:(scenario jump_rel8)</span>
-<span id="L9" class="LineNr">  9 </span>== <span class="Constant">0x1</span>
-<span id="L10" class="LineNr"> 10 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L11" class="LineNr"> 11 </span>  eb                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
-<span id="L12" class="LineNr"> 12 </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="L13" class="LineNr"> 13 </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="L14" class="LineNr"> 14 </span><span class="traceContains">+run: 0x00000001 opcode: eb</span>
-<span id="L15" class="LineNr"> 15 </span><span class="traceContains">+run: jump 5</span>
-<span id="L16" class="LineNr"> 16 </span><span class="traceContains">+run: 0x00000008 opcode: 05</span>
-<span id="L17" class="LineNr"> 17 </span><span class="traceAbsent">-run: 0x00000003 opcode: 05</span>
-<span id="L18" class="LineNr"> 18 </span>
-<span id="L19" class="LineNr"> 19 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L20" class="LineNr"> 20 </span><span class="Normal">case</span> <span class="Constant">0xeb</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8</span>
-<span id="L21" class="LineNr"> 21 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">());</span>
-<span id="L22" class="LineNr"> 22 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L23" class="LineNr"> 23 </span>  EIP += offset<span class="Delimiter">;</span>
-<span id="L24" class="LineNr"> 24 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L25" class="LineNr"> 25 </span><span class="Delimiter">}</span>
-<span id="L26" class="LineNr"> 26 </span>
-<span id="L27" class="LineNr"> 27 </span><span class="SalientComment">//:: jump if equal/zero</span>
-<span id="L28" class="LineNr"> 28 </span>
-<span id="L29" class="LineNr"> 29 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L30" class="LineNr"> 30 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;74&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if equal, if ZF is set (jcc/jz/je)&quot;</span><span class="Delimiter">);</span>
-<span id="L31" class="LineNr"> 31 </span>
-<span id="L32" class="LineNr"> 32 </span><span class="Delimiter">:(scenario je_rel8_success)</span>
-<span id="L33" class="LineNr"> 33 </span><span class="Special">% ZF = true;</span>
-<span id="L34" class="LineNr"> 34 </span>== <span class="Constant">0x1</span>
-<span id="L35" class="LineNr"> 35 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L36" class="LineNr"> 36 </span>  <span class="Constant">74</span>                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
-<span id="L37" class="LineNr"> 37 </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="L38" class="LineNr"> 38 </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="L39" class="LineNr"> 39 </span><span class="traceContains">+run: 0x00000001 opcode: 74</span>
-<span id="L40" class="LineNr"> 40 </span><span class="traceContains">+run: jump 5</span>
-<span id="L41" class="LineNr"> 41 </span><span class="traceContains">+run: 0x00000008 opcode: 05</span>
-<span id="L42" class="LineNr"> 42 </span><span class="traceAbsent">-run: 0x00000003 opcode: 05</span>
-<span id="L43" class="LineNr"> 43 </span>
-<span id="L44" class="LineNr"> 44 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L45" class="LineNr"> 45 </span><span class="Normal">case</span> <span class="Constant">0x74</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if ZF</span>
-<span id="L46" class="LineNr"> 46 </span>  <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">());</span>
-<span id="L47" class="LineNr"> 47 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L48" class="LineNr"> 48 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L49" class="LineNr"> 49 </span>    EIP += offset<span class="Delimiter">;</span>
-<span id="L50" class="LineNr"> 50 </span>  <span class="Delimiter">}</span>
-<span id="L51" class="LineNr"> 51 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L52" class="LineNr"> 52 </span><span class="Delimiter">}</span>
-<span id="L53" class="LineNr"> 53 </span>
-<span id="L54" class="LineNr"> 54 </span><span class="Delimiter">:(scenario je_rel8_fail)</span>
-<span id="L55" class="LineNr"> 55 </span><span class="Special">% ZF = false;</span>
-<span id="L56" class="LineNr"> 56 </span>== <span class="Constant">0x1</span>
-<span id="L57" class="LineNr"> 57 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L58" class="LineNr"> 58 </span>  <span class="Constant">74</span>                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
-<span id="L59" class="LineNr"> 59 </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="L60" class="LineNr"> 60 </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="L61" class="LineNr"> 61 </span><span class="traceContains">+run: 0x00000001 opcode: 74</span>
-<span id="L62" class="LineNr"> 62 </span><span class="traceContains">+run: 0x00000003 opcode: 05</span>
-<span id="L63" class="LineNr"> 63 </span><span class="traceContains">+run: 0x00000008 opcode: 05</span>
-<span id="L64" class="LineNr"> 64 </span><span class="traceAbsent">-run: jump 5</span>
+<span id="L8" class="LineNr">  8 </span><span class="Delimiter">:(code)</span>
+<span id="L9" class="LineNr">  9 </span><span class="Normal">void</span> <a href='017jump_disp8.cc.html#L9'>test_jump_rel8</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L10" class="LineNr"> 10 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L11" class="LineNr"> 11 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L12" class="LineNr"> 12 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L13" class="LineNr"> 13 </span>      <span class="Constant">&quot;  eb                   05                        \n&quot;</span>  <span class="Comment">// skip 1 instruction</span>
+<span id="L14" class="LineNr"> 14 </span>      <span class="Constant">&quot;  05                                 00 00 00 01 \n&quot;</span>
+<span id="L15" class="LineNr"> 15 </span>      <span class="Constant">&quot;  05                                 00 00 00 02 \n&quot;</span>
+<span id="L16" class="LineNr"> 16 </span>  <span class="Delimiter">);</span>
+<span id="L17" class="LineNr"> 17 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L18" class="LineNr"> 18 </span>      <span class="Constant">&quot;run: 0x00000001 opcode: eb\n&quot;</span>
+<span id="L19" class="LineNr"> 19 </span>      <span class="Constant">&quot;run: jump 5\n&quot;</span>
+<span id="L20" class="LineNr"> 20 </span>      <span class="Constant">&quot;run: 0x00000008 opcode: 05\n&quot;</span>
+<span id="L21" class="LineNr"> 21 </span>  <span class="Delimiter">);</span>
+<span id="L22" class="LineNr"> 22 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: 0x00000003 opcode: 05&quot;</span><span class="Delimiter">);</span>
+<span id="L23" class="LineNr"> 23 </span><span class="Delimiter">}</span>
+<span id="L24" class="LineNr"> 24 </span>
+<span id="L25" class="LineNr"> 25 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L26" class="LineNr"> 26 </span><span class="Normal">case</span> <span class="Constant">0xeb</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8</span>
+<span id="L27" class="LineNr"> 27 </span>  <span class="Normal">int8_t</span> <a href='039debug.cc.html#L30'>offset</a> = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">());</span>
+<span id="L28" class="LineNr"> 28 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span><a href='039debug.cc.html#L30'>offset</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L29" class="LineNr"> 29 </span>  EIP += <a href='039debug.cc.html#L30'>offset</a><span class="Delimiter">;</span>
+<span id="L30" class="LineNr"> 30 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L31" class="LineNr"> 31 </span><span class="Delimiter">}</span>
+<span id="L32" class="LineNr"> 32 </span>
+<span id="L33" class="LineNr"> 33 </span><span class="SalientComment">//:: jump if equal/zero</span>
+<span id="L34" class="LineNr"> 34 </span>
+<span id="L35" class="LineNr"> 35 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L36" class="LineNr"> 36 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;74&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if equal, if <a href='010---vm.cc.html#L80'>ZF</a> is set (jcc/jz/je)&quot;</span><span class="Delimiter">);</span>
+<span id="L37" class="LineNr"> 37 </span>
+<span id="L38" class="LineNr"> 38 </span><span class="Delimiter">:(code)</span>
+<span id="L39" class="LineNr"> 39 </span><span class="Normal">void</span> <a href='017jump_disp8.cc.html#L39'>test_je_rel8_success</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L40" class="LineNr"> 40 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L41" class="LineNr"> 41 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L42" class="LineNr"> 42 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L43" class="LineNr"> 43 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L44" class="LineNr"> 44 </span>      <span class="Constant">&quot;  74                   05                        \n&quot;</span>  <span class="Comment">// skip 1 instruction</span>
+<span id="L45" class="LineNr"> 45 </span>      <span class="Constant">&quot;  05                                 00 00 00 01 \n&quot;</span>
+<span id="L46" class="LineNr"> 46 </span>      <span class="Constant">&quot;  05                                 00 00 00 02 \n&quot;</span>
+<span id="L47" class="LineNr"> 47 </span>  <span class="Delimiter">);</span>
+<span id="L48" class="LineNr"> 48 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L49" class="LineNr"> 49 </span>      <span class="Constant">&quot;run: 0x00000001 opcode: 74\n&quot;</span>
+<span id="L50" class="LineNr"> 50 </span>      <span class="Constant">&quot;run: jump 5\n&quot;</span>
+<span id="L51" class="LineNr"> 51 </span>      <span class="Constant">&quot;run: 0x00000008 opcode: 05\n&quot;</span>
+<span id="L52" class="LineNr"> 52 </span>  <span class="Delimiter">);</span>
+<span id="L53" class="LineNr"> 53 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: 0x00000003 opcode: 05&quot;</span><span class="Delimiter">);</span>
+<span id="L54" class="LineNr"> 54 </span><span class="Delimiter">}</span>
+<span id="L55" class="LineNr"> 55 </span>
+<span id="L56" class="LineNr"> 56 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L57" class="LineNr"> 57 </span><span class="Normal">case</span> <span class="Constant">0x74</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if ZF</span>
+<span id="L58" class="LineNr"> 58 </span>  <span class="Normal">const</span> <span class="Normal">int8_t</span> <a href='039debug.cc.html#L30'>offset</a> = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">());</span>
+<span id="L59" class="LineNr"> 59 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L80'>ZF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L60" class="LineNr"> 60 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span><a href='039debug.cc.html#L30'>offset</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L61" class="LineNr"> 61 </span>    EIP += <a href='039debug.cc.html#L30'>offset</a><span class="Delimiter">;</span>
+<span id="L62" class="LineNr"> 62 </span>  <span class="Delimiter">}</span>
+<span id="L63" class="LineNr"> 63 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L64" class="LineNr"> 64 </span><span class="Delimiter">}</span>
 <span id="L65" class="LineNr"> 65 </span>
-<span id="L66" class="LineNr"> 66 </span><span class="SalientComment">//:: jump if not equal/not zero</span>
-<span id="L67" class="LineNr"> 67 </span>
-<span id="L68" class="LineNr"> 68 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L69" class="LineNr"> 69 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;75&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if not equal, if ZF is not set (jcc/jnz/jne)&quot;</span><span class="Delimiter">);</span>
-<span id="L70" class="LineNr"> 70 </span>
-<span id="L71" class="LineNr"> 71 </span><span class="Delimiter">:(scenario jne_rel8_success)</span>
-<span id="L72" class="LineNr"> 72 </span><span class="Special">% ZF = false;</span>
-<span id="L73" class="LineNr"> 73 </span>== <span class="Constant">0x1</span>
-<span id="L74" class="LineNr"> 74 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L75" class="LineNr"> 75 </span>  <span class="Constant">75</span>                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
-<span id="L76" class="LineNr"> 76 </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="L77" class="LineNr"> 77 </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="L78" class="LineNr"> 78 </span><span class="traceContains">+run: 0x00000001 opcode: 75</span>
-<span id="L79" class="LineNr"> 79 </span><span class="traceContains">+run: jump 5</span>
-<span id="L80" class="LineNr"> 80 </span><span class="traceContains">+run: 0x00000008 opcode: 05</span>
-<span id="L81" class="LineNr"> 81 </span><span class="traceAbsent">-run: 0x00000003 opcode: 05</span>
-<span id="L82" class="LineNr"> 82 </span>
-<span id="L83" class="LineNr"> 83 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L84" class="LineNr"> 84 </span><span class="Normal">case</span> <span class="Constant">0x75</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 unless ZF</span>
-<span id="L85" class="LineNr"> 85 </span>  <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">());</span>
-<span id="L86" class="LineNr"> 86 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L87" class="LineNr"> 87 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L88" class="LineNr"> 88 </span>    EIP += offset<span class="Delimiter">;</span>
-<span id="L89" class="LineNr"> 89 </span>  <span class="Delimiter">}</span>
-<span id="L90" class="LineNr"> 90 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L91" class="LineNr"> 91 </span><span class="Delimiter">}</span>
-<span id="L92" class="LineNr"> 92 </span>
-<span id="L93" class="LineNr"> 93 </span><span class="Delimiter">:(scenario jne_rel8_fail)</span>
-<span id="L94" class="LineNr"> 94 </span><span class="Special">% ZF = true;</span>
-<span id="L95" class="LineNr"> 95 </span>== <span class="Constant">0x1</span>
-<span id="L96" class="LineNr"> 96 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L97" class="LineNr"> 97 </span>  <span class="Constant">75</span>                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
-<span id="L98" class="LineNr"> 98 </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="L99" class="LineNr"> 99 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">2</span>
-<span id="L100" class="LineNr">100 </span><span class="traceContains">+run: 0x00000001 opcode: 75</span>
-<span id="L101" class="LineNr">101 </span><span class="traceContains">+run: 0x00000003 opcode: 05</span>
-<span id="L102" class="LineNr">102 </span><span class="traceContains">+run: 0x00000008 opcode: 05</span>
-<span id="L103" class="LineNr">103 </span><span class="traceAbsent">-run: jump 5</span>
-<span id="L104" class="LineNr">104 </span>
-<span id="L105" class="LineNr">105 </span><span class="SalientComment">//:: jump if greater</span>
+<span id="L66" class="LineNr"> 66 </span><span class="Delimiter">:(code)</span>
+<span id="L67" class="LineNr"> 67 </span><span class="Normal">void</span> <a href='017jump_disp8.cc.html#L67'>test_je_rel8_fail</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L68" class="LineNr"> 68 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L69" class="LineNr"> 69 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L70" class="LineNr"> 70 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L71" class="LineNr"> 71 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L72" class="LineNr"> 72 </span>      <span class="Constant">&quot;  74                   05                        \n&quot;</span>  <span class="Comment">// skip 1 instruction</span>
+<span id="L73" class="LineNr"> 73 </span>      <span class="Constant">&quot;  05                                 00 00 00 01 \n&quot;</span>
+<span id="L74" class="LineNr"> 74 </span>      <span class="Constant">&quot;  05                                 00 00 00 02 \n&quot;</span>
+<span id="L75" class="LineNr"> 75 </span>  <span class="Delimiter">);</span>
+<span id="L76" class="LineNr"> 76 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L77" class="LineNr"> 77 </span>      <span class="Constant">&quot;run: 0x00000001 opcode: 74\n&quot;</span>
+<span id="L78" class="LineNr"> 78 </span>      <span class="Constant">&quot;run: 0x00000003 opcode: 05\n&quot;</span>
+<span id="L79" class="LineNr"> 79 </span>      <span class="Constant">&quot;run: 0x00000008 opcode: 05\n&quot;</span>
+<span id="L80" class="LineNr"> 80 </span>  <span class="Delimiter">);</span>
+<span id="L81" class="LineNr"> 81 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: jump 5&quot;</span><span class="Delimiter">);</span>
+<span id="L82" class="LineNr"> 82 </span><span class="Delimiter">}</span>
+<span id="L83" class="LineNr"> 83 </span>
+<span id="L84" class="LineNr"> 84 </span><span class="SalientComment">//:: jump if not equal/not zero</span>
+<span id="L85" class="LineNr"> 85 </span>
+<span id="L86" class="LineNr"> 86 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L87" class="LineNr"> 87 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;75&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if not equal, if <a href='010---vm.cc.html#L80'>ZF</a> is not set (jcc/jnz/jne)&quot;</span><span class="Delimiter">);</span>
+<span id="L88" class="LineNr"> 88 </span>
+<span id="L89" class="LineNr"> 89 </span><span class="Delimiter">:(code)</span>
+<span id="L90" class="LineNr"> 90 </span><span class="Normal">void</span> <a href='017jump_disp8.cc.html#L90'>test_jne_rel8_success</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L91" class="LineNr"> 91 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L92" class="LineNr"> 92 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L93" class="LineNr"> 93 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L94" class="LineNr"> 94 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L95" class="LineNr"> 95 </span>      <span class="Constant">&quot;  75                   05                        \n&quot;</span>  <span class="Comment">// skip 1 instruction</span>
+<span id="L96" class="LineNr"> 96 </span>      <span class="Constant">&quot;  05                                 00 00 00 01 \n&quot;</span>
+<span id="L97" class="LineNr"> 97 </span>      <span class="Constant">&quot;  05                                 00 00 00 02 \n&quot;</span>
+<span id="L98" class="LineNr"> 98 </span>  <span class="Delimiter">);</span>
+<span id="L99" class="LineNr"> 99 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L100" class="LineNr">100 </span>      <span class="Constant">&quot;run: 0x00000001 opcode: 75\n&quot;</span>
+<span id="L101" class="LineNr">101 </span>      <span class="Constant">&quot;run: jump 5\n&quot;</span>
+<span id="L102" class="LineNr">102 </span>      <span class="Constant">&quot;run: 0x00000008 opcode: 05\n&quot;</span>
+<span id="L103" class="LineNr">103 </span>  <span class="Delimiter">);</span>
+<span id="L104" class="LineNr">104 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: 0x00000003 opcode: 05&quot;</span><span class="Delimiter">);</span>
+<span id="L105" class="LineNr">105 </span><span class="Delimiter">}</span>
 <span id="L106" class="LineNr">106 </span>
-<span id="L107" class="LineNr">107 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L108" class="LineNr">108 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if greater, if ZF is unset and SF == <a href='010---vm.cc.html#L81'>OF</a> (jcc/jg/jnle)&quot;</span><span class="Delimiter">);</span>
-<span id="L109" class="LineNr">109 </span>
-<span id="L110" class="LineNr">110 </span><span class="Delimiter">:(scenario jg_rel8_success)</span>
-<span id="L111" class="LineNr">111 </span><span class="Special">% ZF = false;</span>
-<span id="L112" class="LineNr">112 </span><span class="Special">% SF = false;</span>
-<span id="L113" class="LineNr">113 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span>
-<span id="L114" class="LineNr">114 </span>== <span class="Constant">0x1</span>
-<span id="L115" class="LineNr">115 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L116" class="LineNr">116 </span>  <span class="Constant">7f</span>                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
-<span id="L117" class="LineNr">117 </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="L118" class="LineNr">118 </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="L119" class="LineNr">119 </span><span class="traceContains">+run: 0x00000001 opcode: 7f</span>
-<span id="L120" class="LineNr">120 </span><span class="traceContains">+run: jump 5</span>
-<span id="L121" class="LineNr">121 </span><span class="traceContains">+run: 0x00000008 opcode: 05</span>
-<span id="L122" class="LineNr">122 </span><span class="traceAbsent">-run: 0x00000003 opcode: 05</span>
-<span id="L123" class="LineNr">123 </span>
-<span id="L124" class="LineNr">124 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L125" class="LineNr">125 </span><span class="Normal">case</span> <span class="Constant">0x7f</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if !SF and !ZF</span>
-<span id="L126" class="LineNr">126 </span>  <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">());</span>
-<span id="L127" class="LineNr">127 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF &amp;&amp; SF == <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L128" class="LineNr">128 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L129" class="LineNr">129 </span>    EIP += offset<span class="Delimiter">;</span>
-<span id="L130" class="LineNr">130 </span>  <span class="Delimiter">}</span>
-<span id="L131" class="LineNr">131 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L132" class="LineNr">132 </span><span class="Delimiter">}</span>
-<span id="L133" class="LineNr">133 </span>
-<span id="L134" class="LineNr">134 </span><span class="Delimiter">:(scenario jg_rel8_fail)</span>
-<span id="L135" class="LineNr">135 </span><span class="Special">% ZF = false;</span>
-<span id="L136" class="LineNr">136 </span><span class="Special">% SF = true;</span>
-<span id="L137" class="LineNr">137 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span>
-<span id="L138" class="LineNr">138 </span>== <span class="Constant">0x1</span>
-<span id="L139" class="LineNr">139 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L140" class="LineNr">140 </span>  <span class="Constant">7f</span>                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
-<span id="L141" class="LineNr">141 </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="L142" class="LineNr">142 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">2</span>
-<span id="L143" class="LineNr">143 </span><span class="traceContains">+run: 0x00000001 opcode: 7f</span>
-<span id="L144" class="LineNr">144 </span><span class="traceContains">+run: 0x00000003 opcode: 05</span>
-<span id="L145" class="LineNr">145 </span><span class="traceContains">+run: 0x00000008 opcode: 05</span>
-<span id="L146" class="LineNr">146 </span><span class="traceAbsent">-run: jump 5</span>
-<span id="L147" class="LineNr">147 </span>
-<span id="L148" class="LineNr">148 </span><span class="SalientComment">//:: jump if greater or equal</span>
-<span id="L149" class="LineNr">149 </span>
-<span id="L150" class="LineNr">150 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L151" class="LineNr">151 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if greater or equal, if SF == <a href='010---vm.cc.html#L81'>OF</a> (jcc/jge/jnl)&quot;</span><span class="Delimiter">);</span>
-<span id="L152" class="LineNr">152 </span>
-<span id="L153" class="LineNr">153 </span><span class="Delimiter">:(scenario jge_rel8_success)</span>
-<span id="L154" class="LineNr">154 </span><span class="Special">% SF = false;</span>
-<span id="L155" class="LineNr">155 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span>
-<span id="L156" class="LineNr">156 </span>== <span class="Constant">0x1</span>
-<span id="L157" class="LineNr">157 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L158" class="LineNr">158 </span>  7d                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
-<span id="L159" class="LineNr">159 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
-<span id="L160" class="LineNr">160 </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="L161" class="LineNr">161 </span><span class="traceContains">+run: 0x00000001 opcode: 7d</span>
-<span id="L162" class="LineNr">162 </span><span class="traceContains">+run: jump 5</span>
-<span id="L163" class="LineNr">163 </span><span class="traceContains">+run: 0x00000008 opcode: 05</span>
-<span id="L164" class="LineNr">164 </span><span class="traceAbsent">-run: 0x00000003 opcode: 05</span>
-<span id="L165" class="LineNr">165 </span>
-<span id="L166" class="LineNr">166 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L167" class="LineNr">167 </span><span class="Normal">case</span> <span class="Constant">0x7d</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if !SF</span>
-<span id="L168" class="LineNr">168 </span>  <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">());</span>
-<span id="L169" class="LineNr">169 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>SF == <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L170" class="LineNr">170 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L171" class="LineNr">171 </span>    EIP += offset<span class="Delimiter">;</span>
-<span id="L172" class="LineNr">172 </span>  <span class="Delimiter">}</span>
-<span id="L173" class="LineNr">173 </span>  <span class="Identifier">break</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="Delimiter">:(scenario jge_rel8_fail)</span>
-<span id="L177" class="LineNr">177 </span><span class="Special">% SF = true;</span>
-<span id="L178" class="LineNr">178 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span>
-<span id="L179" class="LineNr">179 </span>== <span class="Constant">0x1</span>
-<span id="L180" class="LineNr">180 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L181" class="LineNr">181 </span>  7d                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
-<span id="L182" class="LineNr">182 </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="L183" class="LineNr">183 </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="L184" class="LineNr">184 </span><span class="traceContains">+run: 0x00000001 opcode: 7d</span>
-<span id="L185" class="LineNr">185 </span><span class="traceContains">+run: 0x00000003 opcode: 05</span>
-<span id="L186" class="LineNr">186 </span><span class="traceContains">+run: 0x00000008 opcode: 05</span>
-<span id="L187" class="LineNr">187 </span><span class="traceAbsent">-run: jump 5</span>
-<span id="L188" class="LineNr">188 </span>
-<span id="L189" class="LineNr">189 </span><span class="SalientComment">//:: jump if lesser</span>
-<span id="L190" class="LineNr">190 </span>
-<span id="L191" class="LineNr">191 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L192" class="LineNr">192 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if lesser, if SF != <a href='010---vm.cc.html#L81'>OF</a> (jcc/jl/jnge)&quot;</span><span class="Delimiter">);</span>
-<span id="L193" class="LineNr">193 </span>
-<span id="L194" class="LineNr">194 </span><span class="Delimiter">:(scenario jl_rel8_success)</span>
-<span id="L195" class="LineNr">195 </span><span class="Special">% ZF = false;</span>
-<span id="L196" class="LineNr">196 </span><span class="Special">% SF = true;</span>
-<span id="L197" class="LineNr">197 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span>
-<span id="L198" class="LineNr">198 </span>== <span class="Constant">0x1</span>
-<span id="L199" class="LineNr">199 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L200" class="LineNr">200 </span>  7c                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
-<span id="L201" class="LineNr">201 </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="L202" class="LineNr">202 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">2</span>
-<span id="L203" class="LineNr">203 </span><span class="traceContains">+run: 0x00000001 opcode: 7c</span>
-<span id="L204" class="LineNr">204 </span><span class="traceContains">+run: jump 5</span>
-<span id="L205" class="LineNr">205 </span><span class="traceContains">+run: 0x00000008 opcode: 05</span>
-<span id="L206" class="LineNr">206 </span><span class="traceAbsent">-run: 0x00000003 opcode: 05</span>
-<span id="L207" class="LineNr">207 </span>
-<span id="L208" class="LineNr">208 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L209" class="LineNr">209 </span><span class="Normal">case</span> <span class="Constant">0x7c</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if SF and !ZF</span>
-<span id="L210" class="LineNr">210 </span>  <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">());</span>
-<span id="L211" class="LineNr">211 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>SF != <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L212" class="LineNr">212 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L213" class="LineNr">213 </span>    EIP += offset<span class="Delimiter">;</span>
-<span id="L214" class="LineNr">214 </span>  <span class="Delimiter">}</span>
-<span id="L215" class="LineNr">215 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L216" class="LineNr">216 </span><span class="Delimiter">}</span>
-<span id="L217" class="LineNr">217 </span>
-<span id="L218" class="LineNr">218 </span><span class="Delimiter">:(scenario jl_rel8_fail)</span>
-<span id="L219" class="LineNr">219 </span><span class="Special">% ZF = false;</span>
-<span id="L220" class="LineNr">220 </span><span class="Special">% SF = false;</span>
-<span id="L221" class="LineNr">221 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span>
-<span id="L222" class="LineNr">222 </span>== <span class="Constant">0x1</span>
-<span id="L223" class="LineNr">223 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L224" class="LineNr">224 </span>  7c                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
-<span id="L225" class="LineNr">225 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
-<span id="L226" class="LineNr">226 </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="L227" class="LineNr">227 </span><span class="traceContains">+run: 0x00000001 opcode: 7c</span>
-<span id="L228" class="LineNr">228 </span><span class="traceContains">+run: 0x00000003 opcode: 05</span>
-<span id="L229" class="LineNr">229 </span><span class="traceContains">+run: 0x00000008 opcode: 05</span>
-<span id="L230" class="LineNr">230 </span><span class="traceAbsent">-run: jump 5</span>
-<span id="L231" class="LineNr">231 </span>
-<span id="L232" class="LineNr">232 </span><span class="SalientComment">//:: jump if lesser or equal</span>
-<span id="L233" class="LineNr">233 </span>
-<span id="L234" class="LineNr">234 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L235" class="LineNr">235 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if lesser or equal, if ZF is set or SF != <a href='010---vm.cc.html#L81'>OF</a> (jcc/jle/jng)&quot;</span><span class="Delimiter">);</span>
-<span id="L236" class="LineNr">236 </span>
-<span id="L237" class="LineNr">237 </span><span class="Delimiter">:(scenario jle_rel8_equal)</span>
-<span id="L238" class="LineNr">238 </span><span class="Special">% ZF = true;</span>
-<span id="L239" class="LineNr">239 </span><span class="Special">% SF = false;</span>
-<span id="L240" class="LineNr">240 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span>
-<span id="L241" class="LineNr">241 </span>== <span class="Constant">0x1</span>
-<span id="L242" class="LineNr">242 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L243" class="LineNr">243 </span>  7e                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
-<span id="L244" class="LineNr">244 </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="L245" class="LineNr">245 </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="L246" class="LineNr">246 </span><span class="traceContains">+run: 0x00000001 opcode: 7e</span>
-<span id="L247" class="LineNr">247 </span><span class="traceContains">+run: jump 5</span>
-<span id="L248" class="LineNr">248 </span><span class="traceContains">+run: 0x00000008 opcode: 05</span>
-<span id="L249" class="LineNr">249 </span><span class="traceAbsent">-run: 0x00000003 opcode: 05</span>
-<span id="L250" class="LineNr">250 </span>
-<span id="L251" class="LineNr">251 </span><span class="Delimiter">:(scenario jle_rel8_lesser)</span>
-<span id="L252" class="LineNr">252 </span><span class="Special">% ZF = false;</span>
-<span id="L253" class="LineNr">253 </span><span class="Special">% SF = true;</span>
-<span id="L254" class="LineNr">254 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span>
-<span id="L255" class="LineNr">255 </span>== <span class="Constant">0x1</span>
-<span id="L256" class="LineNr">256 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L257" class="LineNr">257 </span>  7e                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
-<span id="L258" class="LineNr">258 </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="L259" class="LineNr">259 </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="L260" class="LineNr">260 </span><span class="traceContains">+run: 0x00000001 opcode: 7e</span>
-<span id="L261" class="LineNr">261 </span><span class="traceContains">+run: jump 5</span>
-<span id="L262" class="LineNr">262 </span><span class="traceContains">+run: 0x00000008 opcode: 05</span>
-<span id="L263" class="LineNr">263 </span><span class="traceAbsent">-run: 0x00000003 opcode: 05</span>
-<span id="L264" class="LineNr">264 </span>
-<span id="L265" class="LineNr">265 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L266" class="LineNr">266 </span><span class="Normal">case</span> <span class="Constant">0x7e</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if SF or ZF</span>
-<span id="L267" class="LineNr">267 </span>  <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">());</span>
-<span id="L268" class="LineNr">268 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ZF || SF != <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L269" class="LineNr">269 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L270" class="LineNr">270 </span>    EIP += offset<span class="Delimiter">;</span>
-<span id="L271" class="LineNr">271 </span>  <span class="Delimiter">}</span>
-<span id="L272" class="LineNr">272 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L273" class="LineNr">273 </span><span class="Delimiter">}</span>
-<span id="L274" class="LineNr">274 </span>
-<span id="L275" class="LineNr">275 </span><span class="Delimiter">:(scenario jle_rel8_greater)</span>
-<span id="L276" class="LineNr">276 </span><span class="Special">% ZF = false;</span>
-<span id="L277" class="LineNr">277 </span><span class="Special">% SF = false;</span>
-<span id="L278" class="LineNr">278 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</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>  7e                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
-<span id="L282" class="LineNr">282 </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="L283" class="LineNr">283 </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="L284" class="LineNr">284 </span><span class="traceContains">+run: 0x00000001 opcode: 7e</span>
-<span id="L285" class="LineNr">285 </span><span class="traceContains">+run: 0x00000003 opcode: 05</span>
-<span id="L286" class="LineNr">286 </span><span class="traceContains">+run: 0x00000008 opcode: 05</span>
-<span id="L287" class="LineNr">287 </span><span class="traceAbsent">-run: jump 5</span>
+<span id="L107" class="LineNr">107 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L108" class="LineNr">108 </span><span class="Normal">case</span> <span class="Constant">0x75</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 unless ZF</span>
+<span id="L109" class="LineNr">109 </span>  <span class="Normal">const</span> <span class="Normal">int8_t</span> <a href='039debug.cc.html#L30'>offset</a> = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">());</span>
+<span id="L110" class="LineNr">110 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L111" class="LineNr">111 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span><a href='039debug.cc.html#L30'>offset</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L112" class="LineNr">112 </span>    EIP += <a href='039debug.cc.html#L30'>offset</a><span class="Delimiter">;</span>
+<span id="L113" class="LineNr">113 </span>  <span class="Delimiter">}</span>
+<span id="L114" class="LineNr">114 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L115" class="LineNr">115 </span><span class="Delimiter">}</span>
+<span id="L116" class="LineNr">116 </span>
+<span id="L117" class="LineNr">117 </span><span class="Delimiter">:(code)</span>
+<span id="L118" class="LineNr">118 </span><span class="Normal">void</span> <a href='017jump_disp8.cc.html#L118'>test_jne_rel8_fail</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L119" class="LineNr">119 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L120" class="LineNr">120 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L121" class="LineNr">121 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L122" class="LineNr">122 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L123" class="LineNr">123 </span>      <span class="Constant">&quot;  75                   05                        \n&quot;</span>  <span class="Comment">// skip 1 instruction</span>
+<span id="L124" class="LineNr">124 </span>      <span class="Constant">&quot;  05                                 00 00 00 01 \n&quot;</span>
+<span id="L125" class="LineNr">125 </span>      <span class="Constant">&quot;  05                                 00 00 00 02 \n&quot;</span>
+<span id="L126" class="LineNr">126 </span>  <span class="Delimiter">);</span>
+<span id="L127" class="LineNr">127 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L128" class="LineNr">128 </span>      <span class="Constant">&quot;run: 0x00000001 opcode: 75\n&quot;</span>
+<span id="L129" class="LineNr">129 </span>      <span class="Constant">&quot;run: 0x00000003 opcode: 05\n&quot;</span>
+<span id="L130" class="LineNr">130 </span>      <span class="Constant">&quot;run: 0x00000008 opcode: 05\n&quot;</span>
+<span id="L131" class="LineNr">131 </span>  <span class="Delimiter">);</span>
+<span id="L132" class="LineNr">132 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: jump 5&quot;</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="SalientComment">//:: jump if greater</span>
+<span id="L136" class="LineNr">136 </span>
+<span id="L137" class="LineNr">137 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L138" class="LineNr">138 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if greater, if <a href='010---vm.cc.html#L80'>ZF</a> is unset and SF == <a href='010---vm.cc.html#L81'>OF</a> (jcc/jg/jnle)&quot;</span><span class="Delimiter">);</span>
+<span id="L139" class="LineNr">139 </span>
+<span id="L140" class="LineNr">140 </span><span class="Delimiter">:(code)</span>
+<span id="L141" class="LineNr">141 </span><span class="Normal">void</span> <a href='017jump_disp8.cc.html#L141'>test_jg_rel8_success</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L142" class="LineNr">142 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L143" class="LineNr">143 </span>  SF = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L144" class="LineNr">144 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L145" class="LineNr">145 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L146" class="LineNr">146 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L147" class="LineNr">147 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L148" class="LineNr">148 </span>      <span class="Constant">&quot;  7f                   05                        \n&quot;</span>  <span class="Comment">// skip 1 instruction</span>
+<span id="L149" class="LineNr">149 </span>      <span class="Constant">&quot;  05                                 00 00 00 01 \n&quot;</span>
+<span id="L150" class="LineNr">150 </span>      <span class="Constant">&quot;  05                                 00 00 00 02 \n&quot;</span>
+<span id="L151" class="LineNr">151 </span>  <span class="Delimiter">);</span>
+<span id="L152" class="LineNr">152 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L153" class="LineNr">153 </span>      <span class="Constant">&quot;run: 0x00000001 opcode: 7f\n&quot;</span>
+<span id="L154" class="LineNr">154 </span>      <span class="Constant">&quot;run: jump 5\n&quot;</span>
+<span id="L155" class="LineNr">155 </span>      <span class="Constant">&quot;run: 0x00000008 opcode: 05\n&quot;</span>
+<span id="L156" class="LineNr">156 </span>  <span class="Delimiter">);</span>
+<span id="L157" class="LineNr">157 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: 0x00000003 opcode: 05&quot;</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 Single-Byte Opcodes&quot;)</span>
+<span id="L161" class="LineNr">161 </span><span class="Normal">case</span> <span class="Constant">0x7f</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if !SF and !ZF</span>
+<span id="L162" class="LineNr">162 </span>  <span class="Normal">const</span> <span class="Normal">int8_t</span> <a href='039debug.cc.html#L30'>offset</a> = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">());</span>
+<span id="L163" class="LineNr">163 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF &amp;&amp; SF == <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L164" class="LineNr">164 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span><a href='039debug.cc.html#L30'>offset</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L165" class="LineNr">165 </span>    EIP += <a href='039debug.cc.html#L30'>offset</a><span class="Delimiter">;</span>
+<span id="L166" class="LineNr">166 </span>  <span class="Delimiter">}</span>
+<span id="L167" class="LineNr">167 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L168" class="LineNr">168 </span><span class="Delimiter">}</span>
+<span id="L169" class="LineNr">169 </span>
+<span id="L170" class="LineNr">170 </span><span class="Delimiter">:(code)</span>
+<span id="L171" class="LineNr">171 </span><span class="Normal">void</span> <a href='017jump_disp8.cc.html#L171'>test_jg_rel8_fail</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L172" class="LineNr">172 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L173" class="LineNr">173 </span>  SF = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L174" class="LineNr">174 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L175" class="LineNr">175 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L176" class="LineNr">176 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L177" class="LineNr">177 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L178" class="LineNr">178 </span>      <span class="Constant">&quot;  7f                   05                        \n&quot;</span>  <span class="Comment">// skip 1 instruction</span>
+<span id="L179" class="LineNr">179 </span>      <span class="Constant">&quot;  05                                 00 00 00 01 \n&quot;</span>
+<span id="L180" class="LineNr">180 </span>      <span class="Constant">&quot;  05                                 00 00 00 02 \n&quot;</span>
+<span id="L181" class="LineNr">181 </span>  <span class="Delimiter">);</span>
+<span id="L182" class="LineNr">182 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L183" class="LineNr">183 </span>      <span class="Constant">&quot;run: 0x00000001 opcode: 7f\n&quot;</span>
+<span id="L184" class="LineNr">184 </span>      <span class="Constant">&quot;run: 0x00000003 opcode: 05\n&quot;</span>
+<span id="L185" class="LineNr">185 </span>      <span class="Constant">&quot;run: 0x00000008 opcode: 05\n&quot;</span>
+<span id="L186" class="LineNr">186 </span>  <span class="Delimiter">);</span>
+<span id="L187" class="LineNr">187 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: jump 5&quot;</span><span class="Delimiter">);</span>
+<span id="L188" class="LineNr">188 </span><span class="Delimiter">}</span>
+<span id="L189" class="LineNr">189 </span>
+<span id="L190" class="LineNr">190 </span><span class="SalientComment">//:: jump if greater or equal</span>
+<span id="L191" class="LineNr">191 </span>
+<span id="L192" class="LineNr">192 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L193" class="LineNr">193 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if greater or equal, if SF == <a href='010---vm.cc.html#L81'>OF</a> (jcc/jge/jnl)&quot;</span><span class="Delimiter">);</span>
+<span id="L194" class="LineNr">194 </span>
+<span id="L195" class="LineNr">195 </span><span class="Delimiter">:(code)</span>
+<span id="L196" class="LineNr">196 </span><span class="Normal">void</span> <a href='017jump_disp8.cc.html#L196'>test_jge_rel8_success</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L197" class="LineNr">197 </span>  SF = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L198" class="LineNr">198 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L199" class="LineNr">199 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L200" class="LineNr">200 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L201" class="LineNr">201 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L202" class="LineNr">202 </span>      <span class="Constant">&quot;  7d                   05                        \n&quot;</span>  <span class="Comment">// skip 1 instruction</span>
+<span id="L203" class="LineNr">203 </span>      <span class="Constant">&quot;  05                                 00 00 00 01 \n&quot;</span>
+<span id="L204" class="LineNr">204 </span>      <span class="Constant">&quot;  05                                 00 00 00 02 \n&quot;</span>
+<span id="L205" class="LineNr">205 </span>  <span class="Delimiter">);</span>
+<span id="L206" class="LineNr">206 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L207" class="LineNr">207 </span>      <span class="Constant">&quot;run: 0x00000001 opcode: 7d\n&quot;</span>
+<span id="L208" class="LineNr">208 </span>      <span class="Constant">&quot;run: jump 5\n&quot;</span>
+<span id="L209" class="LineNr">209 </span>      <span class="Constant">&quot;run: 0x00000008 opcode: 05\n&quot;</span>
+<span id="L210" class="LineNr">210 </span>  <span class="Delimiter">);</span>
+<span id="L211" class="LineNr">211 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: 0x00000003 opcode: 05&quot;</span><span class="Delimiter">);</span>
+<span id="L212" class="LineNr">212 </span><span class="Delimiter">}</span>
+<span id="L213" class="LineNr">213 </span>
+<span id="L214" class="LineNr">214 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L215" class="LineNr">215 </span><span class="Normal">case</span> <span class="Constant">0x7d</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if !SF</span>
+<span id="L216" class="LineNr">216 </span>  <span class="Normal">const</span> <span class="Normal">int8_t</span> <a href='039debug.cc.html#L30'>offset</a> = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">());</span>
+<span id="L217" class="LineNr">217 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>SF == <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L218" class="LineNr">218 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span><a href='039debug.cc.html#L30'>offset</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L219" class="LineNr">219 </span>    EIP += <a href='039debug.cc.html#L30'>offset</a><span class="Delimiter">;</span>
+<span id="L220" class="LineNr">220 </span>  <span class="Delimiter">}</span>
+<span id="L221" class="LineNr">221 </span>  <span class="Identifier">break</span><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="Delimiter">:(code)</span>
+<span id="L225" class="LineNr">225 </span><span class="Normal">void</span> <a href='017jump_disp8.cc.html#L225'>test_jge_rel8_fail</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L226" class="LineNr">226 </span>  SF = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L227" class="LineNr">227 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L228" class="LineNr">228 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L229" class="LineNr">229 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L230" class="LineNr">230 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L231" class="LineNr">231 </span>      <span class="Constant">&quot;  7d                   05                        \n&quot;</span>  <span class="Comment">// skip 1 instruction</span>
+<span id="L232" class="LineNr">232 </span>      <span class="Constant">&quot;  05                                 00 00 00 01 \n&quot;</span>
+<span id="L233" class="LineNr">233 </span>      <span class="Constant">&quot;  05                                 00 00 00 02 \n&quot;</span>
+<span id="L234" class="LineNr">234 </span>  <span class="Delimiter">);</span>
+<span id="L235" class="LineNr">235 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L236" class="LineNr">236 </span>      <span class="Constant">&quot;run: 0x00000001 opcode: 7d\n&quot;</span>
+<span id="L237" class="LineNr">237 </span>      <span class="Constant">&quot;run: 0x00000003 opcode: 05\n&quot;</span>
+<span id="L238" class="LineNr">238 </span>      <span class="Constant">&quot;run: 0x00000008 opcode: 05\n&quot;</span>
+<span id="L239" class="LineNr">239 </span>  <span class="Delimiter">);</span>
+<span id="L240" class="LineNr">240 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: jump 5&quot;</span><span class="Delimiter">);</span>
+<span id="L241" class="LineNr">241 </span><span class="Delimiter">}</span>
+<span id="L242" class="LineNr">242 </span>
+<span id="L243" class="LineNr">243 </span><span class="SalientComment">//:: jump if lesser</span>
+<span id="L244" class="LineNr">244 </span>
+<span id="L245" class="LineNr">245 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L246" class="LineNr">246 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if lesser, if SF != <a href='010---vm.cc.html#L81'>OF</a> (jcc/jl/jnge)&quot;</span><span class="Delimiter">);</span>
+<span id="L247" class="LineNr">247 </span>
+<span id="L248" class="LineNr">248 </span><span class="Delimiter">:(code)</span>
+<span id="L249" class="LineNr">249 </span><span class="Normal">void</span> <a href='017jump_disp8.cc.html#L249'>test_jl_rel8_success</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L250" class="LineNr">250 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L251" class="LineNr">251 </span>  SF = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L252" class="LineNr">252 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L253" class="LineNr">253 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L254" class="LineNr">254 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L255" class="LineNr">255 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L256" class="LineNr">256 </span>      <span class="Constant">&quot;  7c                   05                        \n&quot;</span>  <span class="Comment">// skip 1 instruction</span>
+<span id="L257" class="LineNr">257 </span>      <span class="Constant">&quot;  05                                 00 00 00 01 \n&quot;</span>
+<span id="L258" class="LineNr">258 </span>      <span class="Constant">&quot;  05                                 00 00 00 02 \n&quot;</span>
+<span id="L259" class="LineNr">259 </span>  <span class="Delimiter">);</span>
+<span id="L260" class="LineNr">260 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L261" class="LineNr">261 </span>      <span class="Constant">&quot;run: 0x00000001 opcode: 7c\n&quot;</span>
+<span id="L262" class="LineNr">262 </span>      <span class="Constant">&quot;run: jump 5\n&quot;</span>
+<span id="L263" class="LineNr">263 </span>      <span class="Constant">&quot;run: 0x00000008 opcode: 05\n&quot;</span>
+<span id="L264" class="LineNr">264 </span>  <span class="Delimiter">);</span>
+<span id="L265" class="LineNr">265 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: 0x00000003 opcode: 05&quot;</span><span class="Delimiter">);</span>
+<span id="L266" class="LineNr">266 </span><span class="Delimiter">}</span>
+<span id="L267" class="LineNr">267 </span>
+<span id="L268" class="LineNr">268 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L269" class="LineNr">269 </span><span class="Normal">case</span> <span class="Constant">0x7c</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if SF and !ZF</span>
+<span id="L270" class="LineNr">270 </span>  <span class="Normal">const</span> <span class="Normal">int8_t</span> <a href='039debug.cc.html#L30'>offset</a> = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">());</span>
+<span id="L271" class="LineNr">271 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>SF != <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L272" class="LineNr">272 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span><a href='039debug.cc.html#L30'>offset</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L273" class="LineNr">273 </span>    EIP += <a href='039debug.cc.html#L30'>offset</a><span class="Delimiter">;</span>
+<span id="L274" class="LineNr">274 </span>  <span class="Delimiter">}</span>
+<span id="L275" class="LineNr">275 </span>  <span class="Identifier">break</span><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="Delimiter">:(code)</span>
+<span id="L279" class="LineNr">279 </span><span class="Normal">void</span> <a href='017jump_disp8.cc.html#L279'>test_jl_rel8_fail</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L280" class="LineNr">280 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L281" class="LineNr">281 </span>  SF = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L282" class="LineNr">282 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L283" class="LineNr">283 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L284" class="LineNr">284 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L285" class="LineNr">285 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L286" class="LineNr">286 </span>      <span class="Constant">&quot;  7c                   05                        \n&quot;</span>  <span class="Comment">// skip 1 instruction</span>
+<span id="L287" class="LineNr">287 </span>      <span class="Constant">&quot;  05                                 00 00 00 01 \n&quot;</span>
+<span id="L288" class="LineNr">288 </span>      <span class="Constant">&quot;  05                                 00 00 00 02 \n&quot;</span>
+<span id="L289" class="LineNr">289 </span>  <span class="Delimiter">);</span>
+<span id="L290" class="LineNr">290 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L291" class="LineNr">291 </span>      <span class="Constant">&quot;run: 0x00000001 opcode: 7c\n&quot;</span>
+<span id="L292" class="LineNr">292 </span>      <span class="Constant">&quot;run: 0x00000003 opcode: 05\n&quot;</span>
+<span id="L293" class="LineNr">293 </span>      <span class="Constant">&quot;run: 0x00000008 opcode: 05\n&quot;</span>
+<span id="L294" class="LineNr">294 </span>  <span class="Delimiter">);</span>
+<span id="L295" class="LineNr">295 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: jump 5&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="SalientComment">//:: jump if lesser or equal</span>
+<span id="L299" class="LineNr">299 </span>
+<span id="L300" class="LineNr">300 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L301" class="LineNr">301 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if lesser or equal, if <a href='010---vm.cc.html#L80'>ZF</a> is set or SF != <a href='010---vm.cc.html#L81'>OF</a> (jcc/jle/jng)&quot;</span><span class="Delimiter">);</span>
+<span id="L302" class="LineNr">302 </span>
+<span id="L303" class="LineNr">303 </span><span class="Delimiter">:(code)</span>
+<span id="L304" class="LineNr">304 </span><span class="Normal">void</span> <a href='017jump_disp8.cc.html#L304'>test_jle_rel8_equal</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L305" class="LineNr">305 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L306" class="LineNr">306 </span>  SF = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L307" class="LineNr">307 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L308" class="LineNr">308 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L309" class="LineNr">309 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</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>      <span class="Constant">&quot;  7e                   05                        \n&quot;</span>  <span class="Comment">// skip 1 instruction</span>
+<span id="L312" class="LineNr">312 </span>      <span class="Constant">&quot;  05                                 00 00 00 01 \n&quot;</span>
+<span id="L313" class="LineNr">313 </span>      <span class="Constant">&quot;  05                                 00 00 00 02 \n&quot;</span>
+<span id="L314" class="LineNr">314 </span>  <span class="Delimiter">);</span>
+<span id="L315" class="LineNr">315 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L316" class="LineNr">316 </span>      <span class="Constant">&quot;run: 0x00000001 opcode: 7e\n&quot;</span>
+<span id="L317" class="LineNr">317 </span>      <span class="Constant">&quot;run: jump 5\n&quot;</span>
+<span id="L318" class="LineNr">318 </span>      <span class="Constant">&quot;run: 0x00000008 opcode: 05\n&quot;</span>
+<span id="L319" class="LineNr">319 </span>  <span class="Delimiter">);</span>
+<span id="L320" class="LineNr">320 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: 0x00000003 opcode: 05&quot;</span><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">:(code)</span>
+<span id="L324" class="LineNr">324 </span><span class="Normal">void</span> <a href='017jump_disp8.cc.html#L324'>test_jle_rel8_lesser</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L325" class="LineNr">325 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L326" class="LineNr">326 </span>  SF = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L327" class="LineNr">327 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L328" class="LineNr">328 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L329" class="LineNr">329 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L330" class="LineNr">330 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L331" class="LineNr">331 </span>      <span class="Constant">&quot;  7e                   05                        \n&quot;</span>  <span class="Comment">// skip 1 instruction</span>
+<span id="L332" class="LineNr">332 </span>      <span class="Constant">&quot;  05                                 00 00 00 01 \n&quot;</span>
+<span id="L333" class="LineNr">333 </span>      <span class="Constant">&quot;  05                                 00 00 00 02 \n&quot;</span>
+<span id="L334" class="LineNr">334 </span>  <span class="Delimiter">);</span>
+<span id="L335" class="LineNr">335 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L336" class="LineNr">336 </span>      <span class="Constant">&quot;run: 0x00000001 opcode: 7e\n&quot;</span>
+<span id="L337" class="LineNr">337 </span>      <span class="Constant">&quot;run: jump 5\n&quot;</span>
+<span id="L338" class="LineNr">338 </span>      <span class="Constant">&quot;run: 0x00000008 opcode: 05\n&quot;</span>
+<span id="L339" class="LineNr">339 </span>  <span class="Delimiter">);</span>
+<span id="L340" class="LineNr">340 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: 0x00000003 opcode: 05&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 id="L343" class="LineNr">343 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L344" class="LineNr">344 </span><span class="Normal">case</span> <span class="Constant">0x7e</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if SF or ZF</span>
+<span id="L345" class="LineNr">345 </span>  <span class="Normal">const</span> <span class="Normal">int8_t</span> <a href='039debug.cc.html#L30'>offset</a> = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">());</span>
+<span id="L346" class="LineNr">346 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L80'>ZF</a> || SF != <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L347" class="LineNr">347 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span><a href='039debug.cc.html#L30'>offset</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L348" class="LineNr">348 </span>    EIP += <a href='039debug.cc.html#L30'>offset</a><span class="Delimiter">;</span>
+<span id="L349" class="LineNr">349 </span>  <span class="Delimiter">}</span>
+<span id="L350" class="LineNr">350 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L351" class="LineNr">351 </span><span class="Delimiter">}</span>
+<span id="L352" class="LineNr">352 </span>
+<span id="L353" class="LineNr">353 </span><span class="Delimiter">:(code)</span>
+<span id="L354" class="LineNr">354 </span><span class="Normal">void</span> <a href='017jump_disp8.cc.html#L354'>test_jle_rel8_greater</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L355" class="LineNr">355 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L356" class="LineNr">356 </span>  SF = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L357" class="LineNr">357 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L358" class="LineNr">358 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L359" class="LineNr">359 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L360" class="LineNr">360 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L361" class="LineNr">361 </span>      <span class="Constant">&quot;  7e                   05                        \n&quot;</span>  <span class="Comment">// skip 1 instruction</span>
+<span id="L362" class="LineNr">362 </span>      <span class="Constant">&quot;  05                                 00 00 00 01 \n&quot;</span>
+<span id="L363" class="LineNr">363 </span>      <span class="Constant">&quot;  05                                 00 00 00 02 \n&quot;</span>
+<span id="L364" class="LineNr">364 </span>  <span class="Delimiter">);</span>
+<span id="L365" class="LineNr">365 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L366" class="LineNr">366 </span>      <span class="Constant">&quot;run: 0x00000001 opcode: 7e\n&quot;</span>
+<span id="L367" class="LineNr">367 </span>      <span class="Constant">&quot;run: 0x00000003 opcode: 05\n&quot;</span>
+<span id="L368" class="LineNr">368 </span>      <span class="Constant">&quot;run: 0x00000008 opcode: 05\n&quot;</span>
+<span id="L369" class="LineNr">369 </span>  <span class="Delimiter">);</span>
+<span id="L370" class="LineNr">370 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: jump 5&quot;</span><span class="Delimiter">);</span>
+<span id="L371" class="LineNr">371 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/018jump_disp32.cc.html b/html/subx/018jump_disp32.cc.html
index 140450b0..c23d4b8e 100644
--- a/html/subx/018jump_disp32.cc.html
+++ b/html/subx/018jump_disp32.cc.html
@@ -14,9 +14,6 @@ pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-
 body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
-.traceAbsent { color: #c00000; }
-.traceContains { color: #005f00; }
-.PreProc { color: #c000c0; }
 .LineNr { }
 .Constant { color: #008787; }
 .Delimiter { color: #c000c0; }
@@ -65,288 +62,372 @@ if ('onhashchange' in window) {
 <span id="L3" class="LineNr">  3 </span><span class="SalientComment">//:: jump</span>
 <span id="L4" class="LineNr">  4 </span>
 <span id="L5" class="LineNr">  5 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L6" class="LineNr">  6 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;e9&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp32 bytes away (jmp)&quot;</span><span class="Delimiter">);</span>
+<span id="L6" class="LineNr">  6 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;e9&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump <a href='040---tests.cc.html#L83'>disp32</a> bytes away (jmp)&quot;</span><span class="Delimiter">);</span>
 <span id="L7" class="LineNr">  7 </span>
-<span id="L8" class="LineNr">  8 </span><span class="Delimiter">:(scenario jump_disp32)</span>
-<span id="L9" class="LineNr">  9 </span>== <span class="Constant">0x1</span>
-<span id="L10" class="LineNr"> 10 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L11" class="LineNr"> 11 </span>  e9                <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="Comment"># skip 1 instruction</span>
-<span id="L12" class="LineNr"> 12 </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="L13" class="LineNr"> 13 </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="L14" class="LineNr"> 14 </span><span class="traceContains">+run: 0x00000001 opcode: e9</span>
-<span id="L15" class="LineNr"> 15 </span><span class="traceContains">+run: jump 5</span>
-<span id="L16" class="LineNr"> 16 </span><span class="traceContains">+run: 0x0000000b opcode: 05</span>
-<span id="L17" class="LineNr"> 17 </span><span class="traceAbsent">-run: 0x00000006 opcode: 05</span>
-<span id="L18" class="LineNr"> 18 </span>
-<span id="L19" class="LineNr"> 19 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L20" class="LineNr"> 20 </span><span class="Normal">case</span> <span class="Constant">0xe9</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump disp32</span>
-<span id="L21" class="LineNr"> 21 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> offset = <a href='011run.cc.html#L336'>next32</a><span class="Delimiter">();</span>
-<span id="L22" class="LineNr"> 22 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; offset &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L23" class="LineNr"> 23 </span>  EIP += offset<span class="Delimiter">;</span>
-<span id="L24" class="LineNr"> 24 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L25" class="LineNr"> 25 </span><span class="Delimiter">}</span>
-<span id="L26" class="LineNr"> 26 </span>
-<span id="L27" class="LineNr"> 27 </span><span class="SalientComment">//:: jump if equal/zero</span>
-<span id="L28" class="LineNr"> 28 </span>
-<span id="L29" class="LineNr"> 29 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L30" class="LineNr"> 30 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L381'>Name_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;84&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp32 bytes away if equal, if ZF is set (jcc/jz/je)&quot;</span><span class="Delimiter">);</span>
-<span id="L31" class="LineNr"> 31 </span>
-<span id="L32" class="LineNr"> 32 </span><span class="Delimiter">:(scenario je_disp32_success)</span>
-<span id="L33" class="LineNr"> 33 </span><span class="Special">% ZF = true;</span>
-<span id="L34" class="LineNr"> 34 </span>== <span class="Constant">0x1</span>
-<span id="L35" class="LineNr"> 35 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
-<span id="L36" class="LineNr"> 36 </span>  <span class="Constant">0f</span> <span class="Constant">84</span>                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>               <span class="Comment"># skip 1 instruction</span>
-<span id="L37" class="LineNr"> 37 </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="L38" class="LineNr"> 38 </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="L39" class="LineNr"> 39 </span><span class="traceContains">+run: 0x00000001 opcode: 0f</span>
-<span id="L40" class="LineNr"> 40 </span><span class="traceContains">+run: jump 5</span>
-<span id="L41" class="LineNr"> 41 </span><span class="traceContains">+run: 0x0000000c opcode: 05</span>
-<span id="L42" class="LineNr"> 42 </span><span class="traceAbsent">-run: 0x00000007 opcode: 05</span>
-<span id="L43" class="LineNr"> 43 </span>
-<span id="L44" class="LineNr"> 44 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
-<span id="L45" class="LineNr"> 45 </span><span class="Normal">case</span> <span class="Constant">0x84</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump disp32 if ZF</span>
-<span id="L46" class="LineNr"> 46 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> offset = <a href='011run.cc.html#L336'>next32</a><span class="Delimiter">();</span>
-<span id="L47" class="LineNr"> 47 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L48" class="LineNr"> 48 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L49" class="LineNr"> 49 </span>    EIP += offset<span class="Delimiter">;</span>
-<span id="L50" class="LineNr"> 50 </span>  <span class="Delimiter">}</span>
-<span id="L51" class="LineNr"> 51 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L52" class="LineNr"> 52 </span><span class="Delimiter">}</span>
-<span id="L53" class="LineNr"> 53 </span>
-<span id="L54" class="LineNr"> 54 </span><span class="Delimiter">:(scenario je_disp32_fail)</span>
-<span id="L55" class="LineNr"> 55 </span><span class="Special">% ZF = false;</span>
-<span id="L56" class="LineNr"> 56 </span>== <span class="Constant">0x1</span>
-<span id="L57" class="LineNr"> 57 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
-<span id="L58" class="LineNr"> 58 </span>  <span class="Constant">0f</span> <span class="Constant">84</span>                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>               <span class="Comment"># skip 1 instruction</span>
-<span id="L59" class="LineNr"> 59 </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="L60" class="LineNr"> 60 </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="L61" class="LineNr"> 61 </span><span class="traceContains">+run: 0x00000001 opcode: 0f</span>
-<span id="L62" class="LineNr"> 62 </span><span class="traceContains">+run: 0x00000007 opcode: 05</span>
-<span id="L63" class="LineNr"> 63 </span><span class="traceContains">+run: 0x0000000c opcode: 05</span>
-<span id="L64" class="LineNr"> 64 </span><span class="traceAbsent">-run: jump 5</span>
+<span id="L8" class="LineNr">  8 </span><span class="Delimiter">:(code)</span>
+<span id="L9" class="LineNr">  9 </span><span class="Normal">void</span> <a href='018jump_disp32.cc.html#L9'>test_jump_disp32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L10" class="LineNr"> 10 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L11" class="LineNr"> 11 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L12" class="LineNr"> 12 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L13" class="LineNr"> 13 </span>      <span class="Constant">&quot;  e9                   05 00 00 00               \n&quot;</span>  <span class="Comment">// skip 1 instruction</span>
+<span id="L14" class="LineNr"> 14 </span>      <span class="Constant">&quot;  05                                 00 00 00 01 \n&quot;</span>
+<span id="L15" class="LineNr"> 15 </span>      <span class="Constant">&quot;  05                                 00 00 00 02 \n&quot;</span>
+<span id="L16" class="LineNr"> 16 </span>  <span class="Delimiter">);</span>
+<span id="L17" class="LineNr"> 17 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L18" class="LineNr"> 18 </span>      <span class="Constant">&quot;run: 0x00000001 opcode: e9\n&quot;</span>
+<span id="L19" class="LineNr"> 19 </span>      <span class="Constant">&quot;run: jump 5\n&quot;</span>
+<span id="L20" class="LineNr"> 20 </span>      <span class="Constant">&quot;run: 0x0000000b opcode: 05\n&quot;</span>
+<span id="L21" class="LineNr"> 21 </span>  <span class="Delimiter">);</span>
+<span id="L22" class="LineNr"> 22 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: 0x00000006 opcode: 05&quot;</span><span class="Delimiter">);</span>
+<span id="L23" class="LineNr"> 23 </span><span class="Delimiter">}</span>
+<span id="L24" class="LineNr"> 24 </span>
+<span id="L25" class="LineNr"> 25 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L26" class="LineNr"> 26 </span><span class="Normal">case</span> <span class="Constant">0xe9</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump disp32</span>
+<span id="L27" class="LineNr"> 27 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> <a href='039debug.cc.html#L30'>offset</a> = <a href='011run.cc.html#L366'>next32</a><span class="Delimiter">();</span>
+<span id="L28" class="LineNr"> 28 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='039debug.cc.html#L30'>offset</a> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L29" class="LineNr"> 29 </span>  EIP += <a href='039debug.cc.html#L30'>offset</a><span class="Delimiter">;</span>
+<span id="L30" class="LineNr"> 30 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L31" class="LineNr"> 31 </span><span class="Delimiter">}</span>
+<span id="L32" class="LineNr"> 32 </span>
+<span id="L33" class="LineNr"> 33 </span><span class="SalientComment">//:: jump if equal/zero</span>
+<span id="L34" class="LineNr"> 34 </span>
+<span id="L35" class="LineNr"> 35 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L36" class="LineNr"> 36 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L388'>Name_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;84&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump <a href='040---tests.cc.html#L83'>disp32</a> bytes away if equal, if <a href='010---vm.cc.html#L80'>ZF</a> is set (jcc/jz/je)&quot;</span><span class="Delimiter">);</span>
+<span id="L37" class="LineNr"> 37 </span>
+<span id="L38" class="LineNr"> 38 </span><span class="Delimiter">:(code)</span>
+<span id="L39" class="LineNr"> 39 </span><span class="Normal">void</span> <a href='018jump_disp32.cc.html#L39'>test_je_disp32_success</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L40" class="LineNr"> 40 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L41" class="LineNr"> 41 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L42" class="LineNr"> 42 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L43" class="LineNr"> 43 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L44" class="LineNr"> 44 </span>      <span class="Constant">&quot;  0f 84                05 00 00 00               \n&quot;</span>  <span class="Comment">// skip 1 instruction</span>
+<span id="L45" class="LineNr"> 45 </span>      <span class="Constant">&quot;  05                                 00 00 00 01 \n&quot;</span>
+<span id="L46" class="LineNr"> 46 </span>      <span class="Constant">&quot;  05                                 00 00 00 02 \n&quot;</span>
+<span id="L47" class="LineNr"> 47 </span>  <span class="Delimiter">);</span>
+<span id="L48" class="LineNr"> 48 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L49" class="LineNr"> 49 </span>      <span class="Constant">&quot;run: 0x00000001 opcode: 0f\n&quot;</span>
+<span id="L50" class="LineNr"> 50 </span>      <span class="Constant">&quot;run: jump 5\n&quot;</span>
+<span id="L51" class="LineNr"> 51 </span>      <span class="Constant">&quot;run: 0x0000000c opcode: 05\n&quot;</span>
+<span id="L52" class="LineNr"> 52 </span>  <span class="Delimiter">);</span>
+<span id="L53" class="LineNr"> 53 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: 0x00000007 opcode: 05&quot;</span><span class="Delimiter">);</span>
+<span id="L54" class="LineNr"> 54 </span><span class="Delimiter">}</span>
+<span id="L55" class="LineNr"> 55 </span>
+<span id="L56" class="LineNr"> 56 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
+<span id="L57" class="LineNr"> 57 </span><span class="Normal">case</span> <span class="Constant">0x84</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump disp32 if ZF</span>
+<span id="L58" class="LineNr"> 58 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> <a href='039debug.cc.html#L30'>offset</a> = <a href='011run.cc.html#L366'>next32</a><span class="Delimiter">();</span>
+<span id="L59" class="LineNr"> 59 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L80'>ZF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L60" class="LineNr"> 60 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span><a href='039debug.cc.html#L30'>offset</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L61" class="LineNr"> 61 </span>    EIP += <a href='039debug.cc.html#L30'>offset</a><span class="Delimiter">;</span>
+<span id="L62" class="LineNr"> 62 </span>  <span class="Delimiter">}</span>
+<span id="L63" class="LineNr"> 63 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L64" class="LineNr"> 64 </span><span class="Delimiter">}</span>
 <span id="L65" class="LineNr"> 65 </span>
-<span id="L66" class="LineNr"> 66 </span><span class="SalientComment">//:: jump if not equal/not zero</span>
-<span id="L67" class="LineNr"> 67 </span>
-<span id="L68" class="LineNr"> 68 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L69" class="LineNr"> 69 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L381'>Name_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;85&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp32 bytes away if not equal, if ZF is not set (jcc/jnz/jne)&quot;</span><span class="Delimiter">);</span>
-<span id="L70" class="LineNr"> 70 </span>
-<span id="L71" class="LineNr"> 71 </span><span class="Delimiter">:(scenario jne_disp32_success)</span>
-<span id="L72" class="LineNr"> 72 </span><span class="Special">% ZF = false;</span>
-<span id="L73" class="LineNr"> 73 </span>== <span class="Constant">0x1</span>
-<span id="L74" class="LineNr"> 74 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
-<span id="L75" class="LineNr"> 75 </span>  <span class="Constant">0f</span> <span class="Constant">85</span>                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>               <span class="Comment"># skip 1 instruction</span>
-<span id="L76" class="LineNr"> 76 </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="L77" class="LineNr"> 77 </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="L78" class="LineNr"> 78 </span><span class="traceContains">+run: 0x00000001 opcode: 0f</span>
-<span id="L79" class="LineNr"> 79 </span><span class="traceContains">+run: jump 5</span>
-<span id="L80" class="LineNr"> 80 </span><span class="traceContains">+run: 0x0000000c opcode: 05</span>
-<span id="L81" class="LineNr"> 81 </span><span class="traceAbsent">-run: 0x00000007 opcode: 05</span>
-<span id="L82" class="LineNr"> 82 </span>
-<span id="L83" class="LineNr"> 83 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
-<span id="L84" class="LineNr"> 84 </span><span class="Normal">case</span> <span class="Constant">0x85</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump disp32 unless ZF</span>
-<span id="L85" class="LineNr"> 85 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> offset = <a href='011run.cc.html#L336'>next32</a><span class="Delimiter">();</span>
-<span id="L86" class="LineNr"> 86 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L87" class="LineNr"> 87 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L88" class="LineNr"> 88 </span>    EIP += offset<span class="Delimiter">;</span>
-<span id="L89" class="LineNr"> 89 </span>  <span class="Delimiter">}</span>
-<span id="L90" class="LineNr"> 90 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L91" class="LineNr"> 91 </span><span class="Delimiter">}</span>
-<span id="L92" class="LineNr"> 92 </span>
-<span id="L93" class="LineNr"> 93 </span><span class="Delimiter">:(scenario jne_disp32_fail)</span>
-<span id="L94" class="LineNr"> 94 </span><span class="Special">% ZF = true;</span>
-<span id="L95" class="LineNr"> 95 </span>== <span class="Constant">0x1</span>
-<span id="L96" class="LineNr"> 96 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
-<span id="L97" class="LineNr"> 97 </span>  <span class="Constant">0f</span> <span class="Constant">85</span>                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>               <span class="Comment"># skip 1 instruction</span>
-<span id="L98" class="LineNr"> 98 </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="L99" class="LineNr"> 99 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                                  <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">2</span>
-<span id="L100" class="LineNr">100 </span><span class="traceContains">+run: 0x00000001 opcode: 0f</span>
-<span id="L101" class="LineNr">101 </span><span class="traceContains">+run: 0x00000007 opcode: 05</span>
-<span id="L102" class="LineNr">102 </span><span class="traceContains">+run: 0x0000000c opcode: 05</span>
-<span id="L103" class="LineNr">103 </span><span class="traceAbsent">-run: jump 5</span>
-<span id="L104" class="LineNr">104 </span>
-<span id="L105" class="LineNr">105 </span><span class="SalientComment">//:: jump if greater</span>
+<span id="L66" class="LineNr"> 66 </span><span class="Delimiter">:(code)</span>
+<span id="L67" class="LineNr"> 67 </span><span class="Normal">void</span> <a href='018jump_disp32.cc.html#L67'>test_je_disp32_fail</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L68" class="LineNr"> 68 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L69" class="LineNr"> 69 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L70" class="LineNr"> 70 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L71" class="LineNr"> 71 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L72" class="LineNr"> 72 </span>      <span class="Constant">&quot;  0f 84                05 00 00 00               \n&quot;</span>  <span class="Comment">// skip 1 instruction</span>
+<span id="L73" class="LineNr"> 73 </span>      <span class="Constant">&quot;  05                                 00 00 00 01 \n&quot;</span>
+<span id="L74" class="LineNr"> 74 </span>      <span class="Constant">&quot;  05                                 00 00 00 02 \n&quot;</span>
+<span id="L75" class="LineNr"> 75 </span>  <span class="Delimiter">);</span>
+<span id="L76" class="LineNr"> 76 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L77" class="LineNr"> 77 </span>      <span class="Constant">&quot;run: 0x00000001 opcode: 0f\n&quot;</span>
+<span id="L78" class="LineNr"> 78 </span>      <span class="Constant">&quot;run: 0x00000007 opcode: 05\n&quot;</span>
+<span id="L79" class="LineNr"> 79 </span>      <span class="Constant">&quot;run: 0x0000000c opcode: 05\n&quot;</span>
+<span id="L80" class="LineNr"> 80 </span>  <span class="Delimiter">);</span>
+<span id="L81" class="LineNr"> 81 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: jump 5&quot;</span><span class="Delimiter">);</span>
+<span id="L82" class="LineNr"> 82 </span><span class="Delimiter">}</span>
+<span id="L83" class="LineNr"> 83 </span>
+<span id="L84" class="LineNr"> 84 </span><span class="SalientComment">//:: jump if not equal/not zero</span>
+<span id="L85" class="LineNr"> 85 </span>
+<span id="L86" class="LineNr"> 86 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L87" class="LineNr"> 87 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L388'>Name_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;85&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump <a href='040---tests.cc.html#L83'>disp32</a> bytes away if not equal, if <a href='010---vm.cc.html#L80'>ZF</a> is not set (jcc/jnz/jne)&quot;</span><span class="Delimiter">);</span>
+<span id="L88" class="LineNr"> 88 </span>
+<span id="L89" class="LineNr"> 89 </span><span class="Delimiter">:(code)</span>
+<span id="L90" class="LineNr"> 90 </span><span class="Normal">void</span> <a href='018jump_disp32.cc.html#L90'>test_jne_disp32_success</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L91" class="LineNr"> 91 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L92" class="LineNr"> 92 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L93" class="LineNr"> 93 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L94" class="LineNr"> 94 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L95" class="LineNr"> 95 </span>      <span class="Constant">&quot;  0f 85                05 00 00 00               \n&quot;</span>  <span class="Comment">// skip 1 instruction</span>
+<span id="L96" class="LineNr"> 96 </span>      <span class="Constant">&quot;  05                                 00 00 00 01 \n&quot;</span>
+<span id="L97" class="LineNr"> 97 </span>      <span class="Constant">&quot;  05                                 00 00 00 02 \n&quot;</span>
+<span id="L98" class="LineNr"> 98 </span>  <span class="Delimiter">);</span>
+<span id="L99" class="LineNr"> 99 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L100" class="LineNr">100 </span>      <span class="Constant">&quot;run: 0x00000001 opcode: 0f\n&quot;</span>
+<span id="L101" class="LineNr">101 </span>      <span class="Constant">&quot;run: jump 5\n&quot;</span>
+<span id="L102" class="LineNr">102 </span>      <span class="Constant">&quot;run: 0x0000000c opcode: 05\n&quot;</span>
+<span id="L103" class="LineNr">103 </span>  <span class="Delimiter">);</span>
+<span id="L104" class="LineNr">104 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: 0x00000007 opcode: 05&quot;</span><span class="Delimiter">);</span>
+<span id="L105" class="LineNr">105 </span><span class="Delimiter">}</span>
 <span id="L106" class="LineNr">106 </span>
-<span id="L107" class="LineNr">107 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L108" class="LineNr">108 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L381'>Name_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp32 bytes away if greater, if ZF is unset and SF == <a href='010---vm.cc.html#L81'>OF</a> (jcc/jg/jnle)&quot;</span><span class="Delimiter">);</span>
-<span id="L109" class="LineNr">109 </span>
-<span id="L110" class="LineNr">110 </span><span class="Delimiter">:(scenario jg_disp32_success)</span>
-<span id="L111" class="LineNr">111 </span><span class="Special">% ZF = false;</span>
-<span id="L112" class="LineNr">112 </span><span class="Special">% SF = false;</span>
-<span id="L113" class="LineNr">113 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span>
-<span id="L114" class="LineNr">114 </span>== <span class="Constant">0x1</span>
-<span id="L115" class="LineNr">115 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
-<span id="L116" class="LineNr">116 </span>  <span class="Constant">0f</span> <span class="Constant">8f</span>                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>               <span class="Comment"># skip 1 instruction</span>
-<span id="L117" class="LineNr">117 </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="L118" class="LineNr">118 </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="L119" class="LineNr">119 </span><span class="traceContains">+run: 0x00000001 opcode: 0f</span>
-<span id="L120" class="LineNr">120 </span><span class="traceContains">+run: jump 5</span>
-<span id="L121" class="LineNr">121 </span><span class="traceContains">+run: 0x0000000c opcode: 05</span>
-<span id="L122" class="LineNr">122 </span><span class="traceAbsent">-run: 0x00000007 opcode: 05</span>
-<span id="L123" class="LineNr">123 </span>
-<span id="L124" class="LineNr">124 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
-<span id="L125" class="LineNr">125 </span><span class="Normal">case</span> <span class="Constant">0x8f</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump disp32 if !SF and !ZF</span>
-<span id="L126" class="LineNr">126 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> offset = <a href='011run.cc.html#L336'>next32</a><span class="Delimiter">();</span>
-<span id="L127" class="LineNr">127 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF &amp;&amp; SF == <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L128" class="LineNr">128 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L129" class="LineNr">129 </span>    EIP += offset<span class="Delimiter">;</span>
-<span id="L130" class="LineNr">130 </span>  <span class="Delimiter">}</span>
-<span id="L131" class="LineNr">131 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L132" class="LineNr">132 </span><span class="Delimiter">}</span>
-<span id="L133" class="LineNr">133 </span>
-<span id="L134" class="LineNr">134 </span><span class="Delimiter">:(scenario jg_disp32_fail)</span>
-<span id="L135" class="LineNr">135 </span><span class="Special">% ZF = false;</span>
-<span id="L136" class="LineNr">136 </span><span class="Special">% SF = true;</span>
-<span id="L137" class="LineNr">137 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span>
-<span id="L138" class="LineNr">138 </span>== <span class="Constant">0x1</span>
-<span id="L139" class="LineNr">139 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
-<span id="L140" class="LineNr">140 </span>  <span class="Constant">0f</span> <span class="Constant">8f</span>                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>               <span class="Comment"># skip 1 instruction</span>
-<span id="L141" class="LineNr">141 </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="L142" class="LineNr">142 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                                  <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">2</span>
-<span id="L143" class="LineNr">143 </span><span class="traceContains">+run: 0x00000001 opcode: 0f</span>
-<span id="L144" class="LineNr">144 </span><span class="traceContains">+run: 0x00000007 opcode: 05</span>
-<span id="L145" class="LineNr">145 </span><span class="traceContains">+run: 0x0000000c opcode: 05</span>
-<span id="L146" class="LineNr">146 </span><span class="traceAbsent">-run: jump 5</span>
-<span id="L147" class="LineNr">147 </span>
-<span id="L148" class="LineNr">148 </span><span class="SalientComment">//:: jump if greater or equal</span>
-<span id="L149" class="LineNr">149 </span>
-<span id="L150" class="LineNr">150 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L151" class="LineNr">151 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L381'>Name_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp32 bytes away if greater or equal, if SF == <a href='010---vm.cc.html#L81'>OF</a> (jcc/jge/jnl)&quot;</span><span class="Delimiter">);</span>
-<span id="L152" class="LineNr">152 </span>
-<span id="L153" class="LineNr">153 </span><span class="Delimiter">:(scenario jge_disp32_success)</span>
-<span id="L154" class="LineNr">154 </span><span class="Special">% SF = false;</span>
-<span id="L155" class="LineNr">155 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span>
-<span id="L156" class="LineNr">156 </span>== <span class="Constant">0x1</span>
-<span id="L157" class="LineNr">157 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
-<span id="L158" class="LineNr">158 </span>  <span class="Constant">0f</span> 8d                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>               <span class="Comment"># skip 1 instruction</span>
-<span id="L159" class="LineNr">159 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                                  <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
-<span id="L160" class="LineNr">160 </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="L161" class="LineNr">161 </span><span class="traceContains">+run: 0x00000001 opcode: 0f</span>
-<span id="L162" class="LineNr">162 </span><span class="traceContains">+run: jump 5</span>
-<span id="L163" class="LineNr">163 </span><span class="traceContains">+run: 0x0000000c opcode: 05</span>
-<span id="L164" class="LineNr">164 </span><span class="traceAbsent">-run: 0x00000007 opcode: 05</span>
-<span id="L165" class="LineNr">165 </span>
-<span id="L166" class="LineNr">166 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
-<span id="L167" class="LineNr">167 </span><span class="Normal">case</span> <span class="Constant">0x8d</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump disp32 if !SF</span>
-<span id="L168" class="LineNr">168 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> offset = <a href='011run.cc.html#L336'>next32</a><span class="Delimiter">();</span>
-<span id="L169" class="LineNr">169 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>SF == <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L170" class="LineNr">170 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L171" class="LineNr">171 </span>    EIP += offset<span class="Delimiter">;</span>
-<span id="L172" class="LineNr">172 </span>  <span class="Delimiter">}</span>
-<span id="L173" class="LineNr">173 </span>  <span class="Identifier">break</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="Delimiter">:(scenario jge_disp32_fail)</span>
-<span id="L177" class="LineNr">177 </span><span class="Special">% SF = true;</span>
-<span id="L178" class="LineNr">178 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span>
-<span id="L179" class="LineNr">179 </span>== <span class="Constant">0x1</span>
-<span id="L180" class="LineNr">180 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
-<span id="L181" class="LineNr">181 </span>  <span class="Constant">0f</span> 8d                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>               <span class="Comment"># skip 1 instruction</span>
-<span id="L182" class="LineNr">182 </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="L183" class="LineNr">183 </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="L184" class="LineNr">184 </span><span class="traceContains">+run: 0x00000001 opcode: 0f</span>
-<span id="L185" class="LineNr">185 </span><span class="traceContains">+run: 0x00000007 opcode: 05</span>
-<span id="L186" class="LineNr">186 </span><span class="traceContains">+run: 0x0000000c opcode: 05</span>
-<span id="L187" class="LineNr">187 </span><span class="traceAbsent">-run: jump 5</span>
-<span id="L188" class="LineNr">188 </span>
-<span id="L189" class="LineNr">189 </span><span class="SalientComment">//:: jump if lesser</span>
-<span id="L190" class="LineNr">190 </span>
-<span id="L191" class="LineNr">191 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L192" class="LineNr">192 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L381'>Name_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp32 bytes away if lesser, if SF != <a href='010---vm.cc.html#L81'>OF</a> (jcc/jl/jnge)&quot;</span><span class="Delimiter">);</span>
-<span id="L193" class="LineNr">193 </span>
-<span id="L194" class="LineNr">194 </span><span class="Delimiter">:(scenario jl_disp32_success)</span>
-<span id="L195" class="LineNr">195 </span><span class="Special">% ZF = false;</span>
-<span id="L196" class="LineNr">196 </span><span class="Special">% SF = true;</span>
-<span id="L197" class="LineNr">197 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span>
-<span id="L198" class="LineNr">198 </span>== <span class="Constant">0x1</span>
-<span id="L199" class="LineNr">199 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
-<span id="L200" class="LineNr">200 </span>  <span class="Constant">0f</span> 8c                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>               <span class="Comment"># skip 1 instruction</span>
-<span id="L201" class="LineNr">201 </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="L202" class="LineNr">202 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                                  <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">2</span>
-<span id="L203" class="LineNr">203 </span><span class="traceContains">+run: 0x00000001 opcode: 0f</span>
-<span id="L204" class="LineNr">204 </span><span class="traceContains">+run: jump 5</span>
-<span id="L205" class="LineNr">205 </span><span class="traceContains">+run: 0x0000000c opcode: 05</span>
-<span id="L206" class="LineNr">206 </span><span class="traceAbsent">-run: 0x00000007 opcode: 05</span>
-<span id="L207" class="LineNr">207 </span>
-<span id="L208" class="LineNr">208 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
-<span id="L209" class="LineNr">209 </span><span class="Normal">case</span> <span class="Constant">0x8c</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump disp32 if SF and !ZF</span>
-<span id="L210" class="LineNr">210 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> offset = <a href='011run.cc.html#L336'>next32</a><span class="Delimiter">();</span>
-<span id="L211" class="LineNr">211 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>SF != <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L212" class="LineNr">212 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L213" class="LineNr">213 </span>    EIP += offset<span class="Delimiter">;</span>
-<span id="L214" class="LineNr">214 </span>  <span class="Delimiter">}</span>
-<span id="L215" class="LineNr">215 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L216" class="LineNr">216 </span><span class="Delimiter">}</span>
-<span id="L217" class="LineNr">217 </span>
-<span id="L218" class="LineNr">218 </span><span class="Delimiter">:(scenario jl_disp32_fail)</span>
-<span id="L219" class="LineNr">219 </span><span class="Special">% ZF = false;</span>
-<span id="L220" class="LineNr">220 </span><span class="Special">% SF = false;</span>
-<span id="L221" class="LineNr">221 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span>
-<span id="L222" class="LineNr">222 </span>== <span class="Constant">0x1</span>
-<span id="L223" class="LineNr">223 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
-<span id="L224" class="LineNr">224 </span>  <span class="Constant">0f</span> 8c                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>               <span class="Comment"># skip 1 instruction</span>
-<span id="L225" class="LineNr">225 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                                  <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
-<span id="L226" class="LineNr">226 </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="L227" class="LineNr">227 </span><span class="traceContains">+run: 0x00000001 opcode: 0f</span>
-<span id="L228" class="LineNr">228 </span><span class="traceContains">+run: 0x00000007 opcode: 05</span>
-<span id="L229" class="LineNr">229 </span><span class="traceContains">+run: 0x0000000c opcode: 05</span>
-<span id="L230" class="LineNr">230 </span><span class="traceAbsent">-run: jump 5</span>
-<span id="L231" class="LineNr">231 </span>
-<span id="L232" class="LineNr">232 </span><span class="SalientComment">//:: jump if lesser or equal</span>
-<span id="L233" class="LineNr">233 </span>
-<span id="L234" class="LineNr">234 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L235" class="LineNr">235 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L381'>Name_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp32 bytes away if lesser or equal, if ZF is set or SF != <a href='010---vm.cc.html#L81'>OF</a> (jcc/jle/jng)&quot;</span><span class="Delimiter">);</span>
-<span id="L236" class="LineNr">236 </span>
-<span id="L237" class="LineNr">237 </span><span class="Delimiter">:(scenario jle_disp32_equal)</span>
-<span id="L238" class="LineNr">238 </span><span class="Special">% ZF = true;</span>
-<span id="L239" class="LineNr">239 </span><span class="Special">% SF = false;</span>
-<span id="L240" class="LineNr">240 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span>
-<span id="L241" class="LineNr">241 </span>== <span class="Constant">0x1</span>
-<span id="L242" class="LineNr">242 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
-<span id="L243" class="LineNr">243 </span>  <span class="Constant">0f</span> 8e                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>               <span class="Comment"># skip 1 instruction</span>
-<span id="L244" class="LineNr">244 </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="L245" class="LineNr">245 </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="L246" class="LineNr">246 </span><span class="traceContains">+run: 0x00000001 opcode: 0f</span>
-<span id="L247" class="LineNr">247 </span><span class="traceContains">+run: jump 5</span>
-<span id="L248" class="LineNr">248 </span><span class="traceContains">+run: 0x0000000c opcode: 05</span>
-<span id="L249" class="LineNr">249 </span><span class="traceAbsent">-run: 0x00000007 opcode: 05</span>
-<span id="L250" class="LineNr">250 </span>
-<span id="L251" class="LineNr">251 </span><span class="Delimiter">:(scenario jle_disp32_lesser)</span>
-<span id="L252" class="LineNr">252 </span><span class="Special">% ZF = false;</span>
-<span id="L253" class="LineNr">253 </span><span class="Special">% SF = true;</span>
-<span id="L254" class="LineNr">254 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span>
-<span id="L255" class="LineNr">255 </span>== <span class="Constant">0x1</span>
-<span id="L256" class="LineNr">256 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
-<span id="L257" class="LineNr">257 </span>  <span class="Constant">0f</span> 8e                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>               <span class="Comment"># skip 1 instruction</span>
-<span id="L258" class="LineNr">258 </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="L259" class="LineNr">259 </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="L260" class="LineNr">260 </span><span class="traceContains">+run: 0x00000001 opcode: 0f</span>
-<span id="L261" class="LineNr">261 </span><span class="traceContains">+run: jump 5</span>
-<span id="L262" class="LineNr">262 </span><span class="traceContains">+run: 0x0000000c opcode: 05</span>
-<span id="L263" class="LineNr">263 </span><span class="traceAbsent">-run: 0x00000007 opcode: 05</span>
-<span id="L264" class="LineNr">264 </span>
-<span id="L265" class="LineNr">265 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
-<span id="L266" class="LineNr">266 </span><span class="Normal">case</span> <span class="Constant">0x8e</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump disp32 if SF or ZF</span>
-<span id="L267" class="LineNr">267 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> offset = <a href='011run.cc.html#L336'>next32</a><span class="Delimiter">();</span>
-<span id="L268" class="LineNr">268 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ZF || SF != <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L269" class="LineNr">269 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L270" class="LineNr">270 </span>    EIP += offset<span class="Delimiter">;</span>
-<span id="L271" class="LineNr">271 </span>  <span class="Delimiter">}</span>
-<span id="L272" class="LineNr">272 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L273" class="LineNr">273 </span><span class="Delimiter">}</span>
-<span id="L274" class="LineNr">274 </span>
-<span id="L275" class="LineNr">275 </span><span class="Delimiter">:(scenario jle_disp32_greater)</span>
-<span id="L276" class="LineNr">276 </span><span class="Special">% ZF = false;</span>
-<span id="L277" class="LineNr">277 </span><span class="Special">% SF = false;</span>
-<span id="L278" class="LineNr">278 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</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>  <span class="Constant">0f</span> 8e                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>               <span class="Comment"># skip 1 instruction</span>
-<span id="L282" class="LineNr">282 </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="L283" class="LineNr">283 </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="L284" class="LineNr">284 </span><span class="traceContains">+run: 0x00000001 opcode: 0f</span>
-<span id="L285" class="LineNr">285 </span><span class="traceContains">+run: 0x00000007 opcode: 05</span>
-<span id="L286" class="LineNr">286 </span><span class="traceContains">+run: 0x0000000c opcode: 05</span>
-<span id="L287" class="LineNr">287 </span><span class="traceAbsent">-run: jump 5</span>
+<span id="L107" class="LineNr">107 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
+<span id="L108" class="LineNr">108 </span><span class="Normal">case</span> <span class="Constant">0x85</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump disp32 unless ZF</span>
+<span id="L109" class="LineNr">109 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> <a href='039debug.cc.html#L30'>offset</a> = <a href='011run.cc.html#L366'>next32</a><span class="Delimiter">();</span>
+<span id="L110" class="LineNr">110 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L111" class="LineNr">111 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span><a href='039debug.cc.html#L30'>offset</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L112" class="LineNr">112 </span>    EIP += <a href='039debug.cc.html#L30'>offset</a><span class="Delimiter">;</span>
+<span id="L113" class="LineNr">113 </span>  <span class="Delimiter">}</span>
+<span id="L114" class="LineNr">114 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L115" class="LineNr">115 </span><span class="Delimiter">}</span>
+<span id="L116" class="LineNr">116 </span>
+<span id="L117" class="LineNr">117 </span><span class="Delimiter">:(code)</span>
+<span id="L118" class="LineNr">118 </span><span class="Normal">void</span> <a href='018jump_disp32.cc.html#L118'>test_jne_disp32_fail</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L119" class="LineNr">119 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L120" class="LineNr">120 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L121" class="LineNr">121 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L122" class="LineNr">122 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L123" class="LineNr">123 </span>      <span class="Constant">&quot;  0f 85                05 00 00 00               \n&quot;</span>  <span class="Comment">// skip 1 instruction</span>
+<span id="L124" class="LineNr">124 </span>      <span class="Constant">&quot;  05                                 00 00 00 01 \n&quot;</span>
+<span id="L125" class="LineNr">125 </span>      <span class="Constant">&quot;  05                                 00 00 00 02 \n&quot;</span>
+<span id="L126" class="LineNr">126 </span>  <span class="Delimiter">);</span>
+<span id="L127" class="LineNr">127 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L128" class="LineNr">128 </span>      <span class="Constant">&quot;run: 0x00000001 opcode: 0f\n&quot;</span>
+<span id="L129" class="LineNr">129 </span>      <span class="Constant">&quot;run: 0x00000007 opcode: 05\n&quot;</span>
+<span id="L130" class="LineNr">130 </span>      <span class="Constant">&quot;run: 0x0000000c opcode: 05\n&quot;</span>
+<span id="L131" class="LineNr">131 </span>  <span class="Delimiter">);</span>
+<span id="L132" class="LineNr">132 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: jump 5&quot;</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="SalientComment">//:: jump if greater</span>
+<span id="L136" class="LineNr">136 </span>
+<span id="L137" class="LineNr">137 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L138" class="LineNr">138 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L388'>Name_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump <a href='040---tests.cc.html#L83'>disp32</a> bytes away if greater, if <a href='010---vm.cc.html#L80'>ZF</a> is unset and SF == <a href='010---vm.cc.html#L81'>OF</a> (jcc/jg/jnle)&quot;</span><span class="Delimiter">);</span>
+<span id="L139" class="LineNr">139 </span>
+<span id="L140" class="LineNr">140 </span><span class="Delimiter">:(code)</span>
+<span id="L141" class="LineNr">141 </span><span class="Normal">void</span> <a href='018jump_disp32.cc.html#L141'>test_jg_disp32_success</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L142" class="LineNr">142 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L143" class="LineNr">143 </span>  SF = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L144" class="LineNr">144 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L145" class="LineNr">145 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L146" class="LineNr">146 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L147" class="LineNr">147 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L148" class="LineNr">148 </span>      <span class="Constant">&quot;  0f 8f                05 00 00 00               \n&quot;</span>  <span class="Comment">// skip 1 instruction</span>
+<span id="L149" class="LineNr">149 </span>      <span class="Constant">&quot;  05                                 00 00 00 01 \n&quot;</span>
+<span id="L150" class="LineNr">150 </span>      <span class="Constant">&quot;  05                                 00 00 00 02 \n&quot;</span>
+<span id="L151" class="LineNr">151 </span>  <span class="Delimiter">);</span>
+<span id="L152" class="LineNr">152 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L153" class="LineNr">153 </span>      <span class="Constant">&quot;run: 0x00000001 opcode: 0f\n&quot;</span>
+<span id="L154" class="LineNr">154 </span>      <span class="Constant">&quot;run: jump 5\n&quot;</span>
+<span id="L155" class="LineNr">155 </span>      <span class="Constant">&quot;run: 0x0000000c opcode: 05\n&quot;</span>
+<span id="L156" class="LineNr">156 </span>  <span class="Delimiter">);</span>
+<span id="L157" class="LineNr">157 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: 0x00000007 opcode: 05&quot;</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 Two-Byte Opcodes Starting With 0f&quot;)</span>
+<span id="L161" class="LineNr">161 </span><span class="Normal">case</span> <span class="Constant">0x8f</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump disp32 if !SF and !ZF</span>
+<span id="L162" class="LineNr">162 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> <a href='039debug.cc.html#L30'>offset</a> = <a href='011run.cc.html#L366'>next32</a><span class="Delimiter">();</span>
+<span id="L163" class="LineNr">163 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF &amp;&amp; SF == <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L164" class="LineNr">164 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span><a href='039debug.cc.html#L30'>offset</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L165" class="LineNr">165 </span>    EIP += <a href='039debug.cc.html#L30'>offset</a><span class="Delimiter">;</span>
+<span id="L166" class="LineNr">166 </span>  <span class="Delimiter">}</span>
+<span id="L167" class="LineNr">167 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L168" class="LineNr">168 </span><span class="Delimiter">}</span>
+<span id="L169" class="LineNr">169 </span>
+<span id="L170" class="LineNr">170 </span><span class="Delimiter">:(code)</span>
+<span id="L171" class="LineNr">171 </span><span class="Normal">void</span> <a href='018jump_disp32.cc.html#L171'>test_jg_disp32_fail</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L172" class="LineNr">172 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L173" class="LineNr">173 </span>  SF = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L174" class="LineNr">174 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L175" class="LineNr">175 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L176" class="LineNr">176 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L177" class="LineNr">177 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L178" class="LineNr">178 </span>      <span class="Constant">&quot;  0f 8f                05 00 00 00               \n&quot;</span>  <span class="Comment">// skip 1 instruction</span>
+<span id="L179" class="LineNr">179 </span>      <span class="Constant">&quot;  05                                 00 00 00 01 \n&quot;</span>
+<span id="L180" class="LineNr">180 </span>      <span class="Constant">&quot;  05                                 00 00 00 02 \n&quot;</span>
+<span id="L181" class="LineNr">181 </span>  <span class="Delimiter">);</span>
+<span id="L182" class="LineNr">182 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L183" class="LineNr">183 </span>      <span class="Constant">&quot;run: 0x00000001 opcode: 0f\n&quot;</span>
+<span id="L184" class="LineNr">184 </span>      <span class="Constant">&quot;run: 0x00000007 opcode: 05\n&quot;</span>
+<span id="L185" class="LineNr">185 </span>      <span class="Constant">&quot;run: 0x0000000c opcode: 05\n&quot;</span>
+<span id="L186" class="LineNr">186 </span>  <span class="Delimiter">);</span>
+<span id="L187" class="LineNr">187 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: jump 5&quot;</span><span class="Delimiter">);</span>
+<span id="L188" class="LineNr">188 </span><span class="Delimiter">}</span>
+<span id="L189" class="LineNr">189 </span>
+<span id="L190" class="LineNr">190 </span><span class="SalientComment">//:: jump if greater or equal</span>
+<span id="L191" class="LineNr">191 </span>
+<span id="L192" class="LineNr">192 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L193" class="LineNr">193 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L388'>Name_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump <a href='040---tests.cc.html#L83'>disp32</a> bytes away if greater or equal, if SF == <a href='010---vm.cc.html#L81'>OF</a> (jcc/jge/jnl)&quot;</span><span class="Delimiter">);</span>
+<span id="L194" class="LineNr">194 </span>
+<span id="L195" class="LineNr">195 </span><span class="Delimiter">:(code)</span>
+<span id="L196" class="LineNr">196 </span><span class="Normal">void</span> <a href='018jump_disp32.cc.html#L196'>test_jge_disp32_success</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L197" class="LineNr">197 </span>  SF = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L198" class="LineNr">198 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L199" class="LineNr">199 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L200" class="LineNr">200 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L201" class="LineNr">201 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L202" class="LineNr">202 </span>      <span class="Constant">&quot;  0f 8d                05 00 00 00               \n&quot;</span>  <span class="Comment">// skip 1 instruction</span>
+<span id="L203" class="LineNr">203 </span>      <span class="Constant">&quot;  05                                 00 00 00 01 \n&quot;</span>
+<span id="L204" class="LineNr">204 </span>      <span class="Constant">&quot;  05                                 00 00 00 02 \n&quot;</span>
+<span id="L205" class="LineNr">205 </span>  <span class="Delimiter">);</span>
+<span id="L206" class="LineNr">206 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L207" class="LineNr">207 </span>      <span class="Constant">&quot;run: 0x00000001 opcode: 0f\n&quot;</span>
+<span id="L208" class="LineNr">208 </span>      <span class="Constant">&quot;run: jump 5\n&quot;</span>
+<span id="L209" class="LineNr">209 </span>      <span class="Constant">&quot;run: 0x0000000c opcode: 05\n&quot;</span>
+<span id="L210" class="LineNr">210 </span>  <span class="Delimiter">);</span>
+<span id="L211" class="LineNr">211 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: 0x00000007 opcode: 05&quot;</span><span class="Delimiter">);</span>
+<span id="L212" class="LineNr">212 </span><span class="Delimiter">}</span>
+<span id="L213" class="LineNr">213 </span>
+<span id="L214" class="LineNr">214 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
+<span id="L215" class="LineNr">215 </span><span class="Normal">case</span> <span class="Constant">0x8d</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump disp32 if !SF</span>
+<span id="L216" class="LineNr">216 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> <a href='039debug.cc.html#L30'>offset</a> = <a href='011run.cc.html#L366'>next32</a><span class="Delimiter">();</span>
+<span id="L217" class="LineNr">217 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>SF == <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L218" class="LineNr">218 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span><a href='039debug.cc.html#L30'>offset</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L219" class="LineNr">219 </span>    EIP += <a href='039debug.cc.html#L30'>offset</a><span class="Delimiter">;</span>
+<span id="L220" class="LineNr">220 </span>  <span class="Delimiter">}</span>
+<span id="L221" class="LineNr">221 </span>  <span class="Identifier">break</span><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="Delimiter">:(code)</span>
+<span id="L225" class="LineNr">225 </span><span class="Normal">void</span> <a href='018jump_disp32.cc.html#L225'>test_jge_disp32_fail</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L226" class="LineNr">226 </span>  SF = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L227" class="LineNr">227 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L228" class="LineNr">228 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L229" class="LineNr">229 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L230" class="LineNr">230 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L231" class="LineNr">231 </span>      <span class="Constant">&quot;  0f 8d                05 00 00 00               \n&quot;</span>  <span class="Comment">// skip 1 instruction</span>
+<span id="L232" class="LineNr">232 </span>      <span class="Constant">&quot;  05                                 00 00 00 01 \n&quot;</span>
+<span id="L233" class="LineNr">233 </span>      <span class="Constant">&quot;  05                                 00 00 00 02 \n&quot;</span>
+<span id="L234" class="LineNr">234 </span>  <span class="Delimiter">);</span>
+<span id="L235" class="LineNr">235 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L236" class="LineNr">236 </span>      <span class="Constant">&quot;run: 0x00000001 opcode: 0f\n&quot;</span>
+<span id="L237" class="LineNr">237 </span>      <span class="Constant">&quot;run: 0x00000007 opcode: 05\n&quot;</span>
+<span id="L238" class="LineNr">238 </span>      <span class="Constant">&quot;run: 0x0000000c opcode: 05\n&quot;</span>
+<span id="L239" class="LineNr">239 </span>  <span class="Delimiter">);</span>
+<span id="L240" class="LineNr">240 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: jump 5&quot;</span><span class="Delimiter">);</span>
+<span id="L241" class="LineNr">241 </span><span class="Delimiter">}</span>
+<span id="L242" class="LineNr">242 </span>
+<span id="L243" class="LineNr">243 </span><span class="SalientComment">//:: jump if lesser</span>
+<span id="L244" class="LineNr">244 </span>
+<span id="L245" class="LineNr">245 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L246" class="LineNr">246 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L388'>Name_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump <a href='040---tests.cc.html#L83'>disp32</a> bytes away if lesser, if SF != <a href='010---vm.cc.html#L81'>OF</a> (jcc/jl/jnge)&quot;</span><span class="Delimiter">);</span>
+<span id="L247" class="LineNr">247 </span>
+<span id="L248" class="LineNr">248 </span><span class="Delimiter">:(code)</span>
+<span id="L249" class="LineNr">249 </span><span class="Normal">void</span> <a href='018jump_disp32.cc.html#L249'>test_jl_disp32_success</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L250" class="LineNr">250 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L251" class="LineNr">251 </span>  SF = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L252" class="LineNr">252 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L253" class="LineNr">253 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L254" class="LineNr">254 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L255" class="LineNr">255 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L256" class="LineNr">256 </span>      <span class="Constant">&quot;  0f 8c                05 00 00 00               \n&quot;</span>  <span class="Comment">// skip 1 instruction</span>
+<span id="L257" class="LineNr">257 </span>      <span class="Constant">&quot;  05                                 00 00 00 01 \n&quot;</span>
+<span id="L258" class="LineNr">258 </span>      <span class="Constant">&quot;  05                                 00 00 00 02 \n&quot;</span>
+<span id="L259" class="LineNr">259 </span>  <span class="Delimiter">);</span>
+<span id="L260" class="LineNr">260 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L261" class="LineNr">261 </span>      <span class="Constant">&quot;run: 0x00000001 opcode: 0f\n&quot;</span>
+<span id="L262" class="LineNr">262 </span>      <span class="Constant">&quot;run: jump 5\n&quot;</span>
+<span id="L263" class="LineNr">263 </span>      <span class="Constant">&quot;run: 0x0000000c opcode: 05\n&quot;</span>
+<span id="L264" class="LineNr">264 </span>  <span class="Delimiter">);</span>
+<span id="L265" class="LineNr">265 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: 0x00000007 opcode: 05&quot;</span><span class="Delimiter">);</span>
+<span id="L266" class="LineNr">266 </span><span class="Delimiter">}</span>
+<span id="L267" class="LineNr">267 </span>
+<span id="L268" class="LineNr">268 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
+<span id="L269" class="LineNr">269 </span><span class="Normal">case</span> <span class="Constant">0x8c</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump disp32 if SF and !ZF</span>
+<span id="L270" class="LineNr">270 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> <a href='039debug.cc.html#L30'>offset</a> = <a href='011run.cc.html#L366'>next32</a><span class="Delimiter">();</span>
+<span id="L271" class="LineNr">271 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>SF != <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L272" class="LineNr">272 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span><a href='039debug.cc.html#L30'>offset</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L273" class="LineNr">273 </span>    EIP += <a href='039debug.cc.html#L30'>offset</a><span class="Delimiter">;</span>
+<span id="L274" class="LineNr">274 </span>  <span class="Delimiter">}</span>
+<span id="L275" class="LineNr">275 </span>  <span class="Identifier">break</span><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="Delimiter">:(code)</span>
+<span id="L279" class="LineNr">279 </span><span class="Normal">void</span> <a href='018jump_disp32.cc.html#L279'>test_jl_disp32_fail</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L280" class="LineNr">280 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L281" class="LineNr">281 </span>  SF = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L282" class="LineNr">282 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L283" class="LineNr">283 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L284" class="LineNr">284 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L285" class="LineNr">285 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L286" class="LineNr">286 </span>      <span class="Constant">&quot;  0f 8c                05 00 00 00               \n&quot;</span>  <span class="Comment">// skip 1 instruction</span>
+<span id="L287" class="LineNr">287 </span>      <span class="Constant">&quot;  05                                 00 00 00 01 \n&quot;</span>
+<span id="L288" class="LineNr">288 </span>      <span class="Constant">&quot;  05                                 00 00 00 02 \n&quot;</span>
+<span id="L289" class="LineNr">289 </span>  <span class="Delimiter">);</span>
+<span id="L290" class="LineNr">290 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L291" class="LineNr">291 </span>      <span class="Constant">&quot;run: 0x00000001 opcode: 0f\n&quot;</span>
+<span id="L292" class="LineNr">292 </span>      <span class="Constant">&quot;run: 0x00000007 opcode: 05\n&quot;</span>
+<span id="L293" class="LineNr">293 </span>      <span class="Constant">&quot;run: 0x0000000c opcode: 05\n&quot;</span>
+<span id="L294" class="LineNr">294 </span>  <span class="Delimiter">);</span>
+<span id="L295" class="LineNr">295 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: jump 5&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="SalientComment">//:: jump if lesser or equal</span>
+<span id="L299" class="LineNr">299 </span>
+<span id="L300" class="LineNr">300 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L301" class="LineNr">301 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L388'>Name_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump <a href='040---tests.cc.html#L83'>disp32</a> bytes away if lesser or equal, if <a href='010---vm.cc.html#L80'>ZF</a> is set or SF != <a href='010---vm.cc.html#L81'>OF</a> (jcc/jle/jng)&quot;</span><span class="Delimiter">);</span>
+<span id="L302" class="LineNr">302 </span>
+<span id="L303" class="LineNr">303 </span><span class="Delimiter">:(code)</span>
+<span id="L304" class="LineNr">304 </span><span class="Normal">void</span> <a href='018jump_disp32.cc.html#L304'>test_jle_disp32_equal</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L305" class="LineNr">305 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L306" class="LineNr">306 </span>  SF = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L307" class="LineNr">307 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L308" class="LineNr">308 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L309" class="LineNr">309 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</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>      <span class="Constant">&quot;  0f 8e                05 00 00 00               \n&quot;</span>  <span class="Comment">// skip 1 instruction</span>
+<span id="L312" class="LineNr">312 </span>      <span class="Constant">&quot;  05                                 00 00 00 01 \n&quot;</span>
+<span id="L313" class="LineNr">313 </span>      <span class="Constant">&quot;  05                                 00 00 00 02 \n&quot;</span>
+<span id="L314" class="LineNr">314 </span>  <span class="Delimiter">);</span>
+<span id="L315" class="LineNr">315 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L316" class="LineNr">316 </span>      <span class="Constant">&quot;run: 0x00000001 opcode: 0f\n&quot;</span>
+<span id="L317" class="LineNr">317 </span>      <span class="Constant">&quot;run: jump 5\n&quot;</span>
+<span id="L318" class="LineNr">318 </span>      <span class="Constant">&quot;run: 0x0000000c opcode: 05\n&quot;</span>
+<span id="L319" class="LineNr">319 </span>  <span class="Delimiter">);</span>
+<span id="L320" class="LineNr">320 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: 0x00000007 opcode: 05&quot;</span><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">:(code)</span>
+<span id="L324" class="LineNr">324 </span><span class="Normal">void</span> <a href='018jump_disp32.cc.html#L324'>test_jle_disp32_lesser</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L325" class="LineNr">325 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L326" class="LineNr">326 </span>  SF = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L327" class="LineNr">327 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L328" class="LineNr">328 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L329" class="LineNr">329 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L330" class="LineNr">330 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L331" class="LineNr">331 </span>      <span class="Constant">&quot;  0f 8e                05 00 00 00               \n&quot;</span>  <span class="Comment">// skip 1 instruction</span>
+<span id="L332" class="LineNr">332 </span>      <span class="Constant">&quot;  05                                 00 00 00 01 \n&quot;</span>
+<span id="L333" class="LineNr">333 </span>      <span class="Constant">&quot;  05                                 00 00 00 02 \n&quot;</span>
+<span id="L334" class="LineNr">334 </span>  <span class="Delimiter">);</span>
+<span id="L335" class="LineNr">335 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L336" class="LineNr">336 </span>      <span class="Constant">&quot;run: 0x00000001 opcode: 0f\n&quot;</span>
+<span id="L337" class="LineNr">337 </span>      <span class="Constant">&quot;run: jump 5\n&quot;</span>
+<span id="L338" class="LineNr">338 </span>      <span class="Constant">&quot;run: 0x0000000c opcode: 05\n&quot;</span>
+<span id="L339" class="LineNr">339 </span>  <span class="Delimiter">);</span>
+<span id="L340" class="LineNr">340 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: 0x00000007 opcode: 05&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 id="L343" class="LineNr">343 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
+<span id="L344" class="LineNr">344 </span><span class="Normal">case</span> <span class="Constant">0x8e</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump disp32 if SF or ZF</span>
+<span id="L345" class="LineNr">345 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> <a href='039debug.cc.html#L30'>offset</a> = <a href='011run.cc.html#L366'>next32</a><span class="Delimiter">();</span>
+<span id="L346" class="LineNr">346 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L80'>ZF</a> || SF != <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L347" class="LineNr">347 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span><a href='039debug.cc.html#L30'>offset</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L348" class="LineNr">348 </span>    EIP += <a href='039debug.cc.html#L30'>offset</a><span class="Delimiter">;</span>
+<span id="L349" class="LineNr">349 </span>  <span class="Delimiter">}</span>
+<span id="L350" class="LineNr">350 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L351" class="LineNr">351 </span><span class="Delimiter">}</span>
+<span id="L352" class="LineNr">352 </span>
+<span id="L353" class="LineNr">353 </span><span class="Delimiter">:(code)</span>
+<span id="L354" class="LineNr">354 </span><span class="Normal">void</span> <a href='018jump_disp32.cc.html#L354'>test_jle_disp32_greater</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L355" class="LineNr">355 </span>  <a href='010---vm.cc.html#L80'>ZF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L356" class="LineNr">356 </span>  SF = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L357" class="LineNr">357 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L358" class="LineNr">358 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L359" class="LineNr">359 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L360" class="LineNr">360 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L361" class="LineNr">361 </span>      <span class="Constant">&quot;  0f 8e                05 00 00 00               \n&quot;</span>  <span class="Comment">// skip 1 instruction</span>
+<span id="L362" class="LineNr">362 </span>      <span class="Constant">&quot;  05                                 00 00 00 01 \n&quot;</span>
+<span id="L363" class="LineNr">363 </span>      <span class="Constant">&quot;  05                                 00 00 00 02 \n&quot;</span>
+<span id="L364" class="LineNr">364 </span>  <span class="Delimiter">);</span>
+<span id="L365" class="LineNr">365 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L366" class="LineNr">366 </span>      <span class="Constant">&quot;run: 0x00000001 opcode: 0f\n&quot;</span>
+<span id="L367" class="LineNr">367 </span>      <span class="Constant">&quot;run: 0x00000007 opcode: 05\n&quot;</span>
+<span id="L368" class="LineNr">368 </span>      <span class="Constant">&quot;run: 0x0000000c opcode: 05\n&quot;</span>
+<span id="L369" class="LineNr">369 </span>  <span class="Delimiter">);</span>
+<span id="L370" class="LineNr">370 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: jump 5&quot;</span><span class="Delimiter">);</span>
+<span id="L371" class="LineNr">371 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/019functions.cc.html b/html/subx/019functions.cc.html
index 4008c175..0ad5ce43 100644
--- a/html/subx/019functions.cc.html
+++ b/html/subx/019functions.cc.html
@@ -15,8 +15,6 @@ body { font-size:12pt; font-family: monospace; color: #000000; background-color:
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
 .CommentedCode { color: #8a8a8a; }
-.traceContains { color: #005f00; }
-.PreProc { color: #c000c0; }
 .LineNr { }
 .Constant { color: #008787; }
 .Delimiter { color: #c000c0; }
@@ -60,99 +58,123 @@ if ('onhashchange' in window) {
 <body onload='JumpToLine();'>
 <a href='https://github.com/akkartik/mu/blob/master/subx/019functions.cc'>https://github.com/akkartik/mu/blob/master/subx/019functions.cc</a>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr"> 1 </span><span class="SalientComment">//:: call</span>
-<span id="L2" class="LineNr"> 2 </span>
-<span id="L3" class="LineNr"> 3 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L4" class="LineNr"> 4 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;e8&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;call disp32 (call)&quot;</span><span class="Delimiter">);</span>
-<span id="L5" class="LineNr"> 5 </span>
-<span id="L6" class="LineNr"> 6 </span><span class="Delimiter">:(scenario call_disp32)</span>
-<span id="L7" class="LineNr"> 7 </span><span class="Special">% Reg[ESP].u = 0x64;</span>
-<span id="L8" class="LineNr"> 8 </span>== <span class="Constant">0x1</span>
-<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='037heap.cc.html#L23'>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">const</span> <span class="Normal">int32_t</span> offset = <a href='011run.cc.html#L336'>next32</a><span class="Delimiter">();</span>
-<span id="L20" class="LineNr">20 </span>  ++<span class="Special">Callstack_depth</span><span class="Delimiter">;</span>
-<span id="L21" class="LineNr">21 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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='037heap.cc.html#L23'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; offset &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L22" class="LineNr">22 </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="L23" class="LineNr">23 </span>  <a href='012elf.cc.html#L90'>push</a><span class="Delimiter">(</span>EIP<span class="Delimiter">);</span>
-<span id="L24" class="LineNr">24 </span>  EIP += offset<span class="Delimiter">;</span>
-<span id="L25" class="LineNr">25 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L433'>HEXWORD</a> &lt;&lt; EIP &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L26" class="LineNr">26 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L27" class="LineNr">27 </span><span class="Delimiter">}</span>
-<span id="L28" class="LineNr">28 </span>
-<span id="L29" class="LineNr">29 </span><span class="Comment">//:</span>
-<span id="L30" class="LineNr">30 </span>
-<span id="L31" class="LineNr">31 </span><span class="Delimiter">:(scenario call_r32)</span>
-<span id="L32" class="LineNr">32 </span><span class="Special">% Reg[ESP].u = 0x64;</span>
-<span id="L33" class="LineNr">33 </span><span class="Special">% Reg[EBX].u = 0x000000a0;</span>
-<span id="L34" class="LineNr">34 </span>== <span class="Constant">0x1</span>
-<span id="L35" class="LineNr">35 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L36" class="LineNr">36 </span>  ff  d3                                       <span class="Comment"># call function offset at EBX</span>
-<span id="L37" class="LineNr">37 </span>  <span class="Comment"># next EIP is 3</span>
-<span id="L38" class="LineNr">38 </span><span class="traceContains">+run: call to r/m32</span>
-<span id="L39" class="LineNr">39 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L40" class="LineNr">40 </span><span class="traceContains">+run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000060</span>
-<span id="L41" class="LineNr">41 </span><span class="traceContains">+run: pushing value 0x00000003</span>
-<span id="L42" class="LineNr">42 </span><span class="traceContains">+run: jumping to 0x000000a3</span>
-<span id="L43" class="LineNr">43 </span>
-<span id="L44" class="LineNr">44 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
-<span id="L45" class="LineNr">45 </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="L46" class="LineNr">46 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; end<span class="Delimiter">();</span>
-<span id="L47" class="LineNr">47 </span>  <span class="Normal">const</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="L48" class="LineNr">48 </span>  <a href='012elf.cc.html#L90'>push</a><span class="Delimiter">(</span>EIP<span class="Delimiter">);</span>
-<span id="L49" class="LineNr">49 </span>  EIP += *offset<span class="Delimiter">;</span>
-<span id="L50" class="LineNr">50 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L433'>HEXWORD</a> &lt;&lt; EIP &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L51" class="LineNr">51 </span>  ++<span class="Special">Callstack_depth</span><span class="Delimiter">;</span>
-<span id="L52" class="LineNr">52 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L53" class="LineNr">53 </span><span class="Delimiter">}</span>
-<span id="L54" class="LineNr">54 </span>
-<span id="L55" class="LineNr">55 </span><span class="Delimiter">:(scenario call_mem_at_r32)</span>
-<span id="L56" class="LineNr">56 </span><span class="Special">% Reg[ESP].u = 0x64;</span>
-<span id="L57" class="LineNr">57 </span><span class="Special">% Reg[EBX].u = 0x2000;</span>
-<span id="L58" class="LineNr">58 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L59" class="LineNr">59 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L60" class="LineNr">60 </span>  ff  <span class="Constant">13</span>                                       <span class="Comment"># call function offset at *EBX</span>
-<span id="L61" class="LineNr">61 </span>  <span class="Comment"># next EIP is 3</span>
-<span id="L62" class="LineNr">62 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L63" class="LineNr">63 </span>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"># 0xa0</span>
-<span id="L64" class="LineNr">64 </span><span class="traceContains">+run: call to r/m32</span>
-<span id="L65" class="LineNr">65 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
-<span id="L66" class="LineNr">66 </span><span class="traceContains">+run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000060</span>
-<span id="L67" class="LineNr">67 </span><span class="traceContains">+run: pushing value 0x00000003</span>
-<span id="L68" class="LineNr">68 </span><span class="traceContains">+run: jumping to 0x000000a3</span>
-<span id="L69" class="LineNr">69 </span>
-<span id="L70" class="LineNr">70 </span><span class="SalientComment">//:: ret</span>
-<span id="L71" class="LineNr">71 </span>
-<span id="L72" class="LineNr">72 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L73" class="LineNr">73 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c3&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;return from most recent unfinished call (ret)&quot;</span><span class="Delimiter">);</span>
-<span id="L74" class="LineNr">74 </span>
-<span id="L75" class="LineNr">75 </span><span class="Delimiter">:(scenario ret)</span>
-<span id="L76" class="LineNr">76 </span><span class="Special">% Reg[ESP].u = 0x2000;</span>
-<span id="L77" class="LineNr">77 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L78" class="LineNr">78 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L79" class="LineNr">79 </span>  c3
-<span id="L80" class="LineNr">80 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L81" class="LineNr">81 </span><span class="Constant">10</span> <span class="PreProc">0</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"># 0x10</span>
-<span id="L82" class="LineNr">82 </span><span class="traceContains">+run: return</span>
-<span id="L83" class="LineNr">83 </span><span class="traceContains">+run: popping value 0x00000010</span>
-<span id="L84" class="LineNr">84 </span><span class="traceContains">+run: jumping to 0x00000010</span>
-<span id="L85" class="LineNr">85 </span>
-<span id="L86" class="LineNr">86 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L87" class="LineNr">87 </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="L88" class="LineNr">88 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;return&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L89" class="LineNr">89 </span>  --<span class="Special">Callstack_depth</span><span class="Delimiter">;</span>
-<span id="L90" class="LineNr">90 </span>  EIP = <a href='013direct_addressing.cc.html#L789'>pop</a><span class="Delimiter">();</span>
-<span id="L91" class="LineNr">91 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L433'>HEXWORD</a> &lt;&lt; EIP &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L92" class="LineNr">92 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L93" class="LineNr">93 </span><span class="Delimiter">}</span>
+<span id="L1" class="LineNr">  1 </span><span class="SalientComment">//:: call</span>
+<span id="L2" class="LineNr">  2 </span>
+<span id="L3" class="LineNr">  3 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L4" class="LineNr">  4 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;e8&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;call <a href='040---tests.cc.html#L83'>disp32</a> (call)&quot;</span><span class="Delimiter">);</span>
+<span id="L5" class="LineNr">  5 </span>
+<span id="L6" class="LineNr">  6 </span><span class="Delimiter">:(code)</span>
+<span id="L7" class="LineNr">  7 </span><span class="Normal">void</span> <a href='019functions.cc.html#L7'>test_call_disp32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L8" class="LineNr">  8 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u = <span class="Constant">0x64</span><span class="Delimiter">;</span>
+<span id="L9" class="LineNr">  9 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L10" class="LineNr"> 10 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L11" class="LineNr"> 11 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L12" class="LineNr"> 12 </span>      <span class="Constant">&quot;  e8                                 a0 00 00 00 \n&quot;</span>  <span class="Comment">// call function offset at 0x000000a0</span>
+<span id="L13" class="LineNr"> 13 </span>      <span class="Comment">// next EIP is 6</span>
+<span id="L14" class="LineNr"> 14 </span>  <span class="Delimiter">);</span>
+<span id="L15" class="LineNr"> 15 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L16" class="LineNr"> 16 </span>      <span class="Constant">&quot;run: call <a href='037heap.cc.html#L23'>imm32</a> 0x000000a0\n&quot;</span>
+<span id="L17" class="LineNr"> 17 </span>      <span class="Constant">&quot;run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000060\n&quot;</span>
+<span id="L18" class="LineNr"> 18 </span>      <span class="Constant">&quot;run: pushing value 0x00000006\n&quot;</span>
+<span id="L19" class="LineNr"> 19 </span>      <span class="Constant">&quot;run: jumping to 0x000000a6\n&quot;</span>
+<span id="L20" class="LineNr"> 20 </span>  <span class="Delimiter">);</span>
+<span id="L21" class="LineNr"> 21 </span><span class="Delimiter">}</span>
+<span id="L22" class="LineNr"> 22 </span>
+<span id="L23" class="LineNr"> 23 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L24" class="LineNr"> 24 </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="L25" class="LineNr"> 25 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> <a href='039debug.cc.html#L30'>offset</a> = <a href='011run.cc.html#L366'>next32</a><span class="Delimiter">();</span>
+<span id="L26" class="LineNr"> 26 </span>  ++<span class="Special">Callstack_depth</span><span class="Delimiter">;</span>
+<span id="L27" class="LineNr"> 27 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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='037heap.cc.html#L23'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; <a href='039debug.cc.html#L30'>offset</a> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L28" class="LineNr"> 28 </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="L29" class="LineNr"> 29 </span>  <a href='012elf.cc.html#L90'>push</a><span class="Delimiter">(</span>EIP<span class="Delimiter">);</span>
+<span id="L30" class="LineNr"> 30 </span>  EIP += <a href='039debug.cc.html#L30'>offset</a><span class="Delimiter">;</span>
+<span id="L31" class="LineNr"> 31 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L440'>HEXWORD</a> &lt;&lt; EIP &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L32" class="LineNr"> 32 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L33" class="LineNr"> 33 </span><span class="Delimiter">}</span>
+<span id="L34" class="LineNr"> 34 </span>
+<span id="L35" class="LineNr"> 35 </span><span class="Comment">//:</span>
+<span id="L36" class="LineNr"> 36 </span>
+<span id="L37" class="LineNr"> 37 </span><span class="Delimiter">:(code)</span>
+<span id="L38" class="LineNr"> 38 </span><span class="Normal">void</span> <a href='019functions.cc.html#L38'>test_call_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L39" class="LineNr"> 39 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u = <span class="Constant">0x64</span><span class="Delimiter">;</span>
+<span id="L40" class="LineNr"> 40 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u = <span class="Constant">0x000000a0</span><span class="Delimiter">;</span>
+<span id="L41" class="LineNr"> 41 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L42" class="LineNr"> 42 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L43" class="LineNr"> 43 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L44" class="LineNr"> 44 </span>      <span class="Constant">&quot;  ff     d3                                      \n&quot;</span>  <span class="Comment">// call function offset at EBX</span>
+<span id="L45" class="LineNr"> 45 </span>      <span class="Comment">// next EIP is 3</span>
+<span id="L46" class="LineNr"> 46 </span>  <span class="Delimiter">);</span>
+<span id="L47" class="LineNr"> 47 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L48" class="LineNr"> 48 </span>      <span class="Constant">&quot;run: call to r/m32\n&quot;</span>
+<span id="L49" class="LineNr"> 49 </span>      <span class="Constant">&quot;run: r/m32 is EBX\n&quot;</span>
+<span id="L50" class="LineNr"> 50 </span>      <span class="Constant">&quot;run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000060\n&quot;</span>
+<span id="L51" class="LineNr"> 51 </span>      <span class="Constant">&quot;run: pushing value 0x00000003\n&quot;</span>
+<span id="L52" class="LineNr"> 52 </span>      <span class="Constant">&quot;run: jumping to 0x000000a3\n&quot;</span>
+<span id="L53" class="LineNr"> 53 </span>  <span class="Delimiter">);</span>
+<span id="L54" class="LineNr"> 54 </span><span class="Delimiter">}</span>
+<span id="L55" class="LineNr"> 55 </span>
+<span id="L56" class="LineNr"> 56 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
+<span id="L57" class="LineNr"> 57 </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="L58" class="LineNr"> 58 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; end<span class="Delimiter">();</span>
+<span id="L59" class="LineNr"> 59 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* <a href='039debug.cc.html#L30'>offset</a> = <a href='013direct_addressing.cc.html#L38'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L60" class="LineNr"> 60 </span>  <a href='012elf.cc.html#L90'>push</a><span class="Delimiter">(</span>EIP<span class="Delimiter">);</span>
+<span id="L61" class="LineNr"> 61 </span>  EIP += *offset<span class="Delimiter">;</span>
+<span id="L62" class="LineNr"> 62 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L440'>HEXWORD</a> &lt;&lt; EIP &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L63" class="LineNr"> 63 </span>  ++<span class="Special">Callstack_depth</span><span class="Delimiter">;</span>
+<span id="L64" class="LineNr"> 64 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L65" class="LineNr"> 65 </span><span class="Delimiter">}</span>
+<span id="L66" class="LineNr"> 66 </span>
+<span id="L67" class="LineNr"> 67 </span><span class="Delimiter">:(code)</span>
+<span id="L68" class="LineNr"> 68 </span><span class="Normal">void</span> <a href='019functions.cc.html#L68'>test_call_mem_at_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L69" class="LineNr"> 69 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u = <span class="Constant">0x64</span><span class="Delimiter">;</span>
+<span id="L70" class="LineNr"> 70 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L71" class="LineNr"> 71 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L72" class="LineNr"> 72 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L73" class="LineNr"> 73 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L74" class="LineNr"> 74 </span>      <span class="Constant">&quot;  ff     13                                      \n&quot;</span>  <span class="Comment">// call function offset at *EBX</span>
+<span id="L75" class="LineNr"> 75 </span>      <span class="Comment">// next EIP is 3</span>
+<span id="L76" class="LineNr"> 76 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L77" class="LineNr"> 77 </span>      <span class="Constant">&quot;a0 00 00 00\n&quot;</span>  <span class="Comment">// 0x000000a0</span>
+<span id="L78" class="LineNr"> 78 </span>  <span class="Delimiter">);</span>
+<span id="L79" class="LineNr"> 79 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L80" class="LineNr"> 80 </span>      <span class="Constant">&quot;run: call to r/m32\n&quot;</span>
+<span id="L81" class="LineNr"> 81 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EBX)\n&quot;</span>
+<span id="L82" class="LineNr"> 82 </span>      <span class="Constant">&quot;run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000060\n&quot;</span>
+<span id="L83" class="LineNr"> 83 </span>      <span class="Constant">&quot;run: pushing value 0x00000003\n&quot;</span>
+<span id="L84" class="LineNr"> 84 </span>      <span class="Constant">&quot;run: jumping to 0x000000a3\n&quot;</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="SalientComment">//:: ret</span>
+<span id="L89" class="LineNr"> 89 </span>
+<span id="L90" class="LineNr"> 90 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L91" class="LineNr"> 91 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c3&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;return from most recent unfinished call (ret)&quot;</span><span class="Delimiter">);</span>
+<span id="L92" class="LineNr"> 92 </span>
+<span id="L93" class="LineNr"> 93 </span><span class="Delimiter">:(code)</span>
+<span id="L94" class="LineNr"> 94 </span><span class="Normal">void</span> <a href='019functions.cc.html#L94'>test_ret</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L95" class="LineNr"> 95 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L96" class="LineNr"> 96 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L97" class="LineNr"> 97 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L98" class="LineNr"> 98 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L99" class="LineNr"> 99 </span>      <span class="Constant">&quot;  c3                                           \n&quot;</span>  <span class="Comment">// return</span>
+<span id="L100" class="LineNr">100 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L101" class="LineNr">101 </span>      <span class="Constant">&quot;10 00 00 00\n&quot;</span>  <span class="Comment">// 0x00000010</span>
+<span id="L102" class="LineNr">102 </span>  <span class="Delimiter">);</span>
+<span id="L103" class="LineNr">103 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L104" class="LineNr">104 </span>      <span class="Constant">&quot;run: return\n&quot;</span>
+<span id="L105" class="LineNr">105 </span>      <span class="Constant">&quot;run: popping value 0x00000010\n&quot;</span>
+<span id="L106" class="LineNr">106 </span>      <span class="Constant">&quot;run: jumping to 0x00000010\n&quot;</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 id="L110" class="LineNr">110 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L111" class="LineNr">111 </span><span class="Normal">case</span> <span class="Constant">0xc3</span>: <span class="Delimiter">{</span>  <span class="Comment">// return from a call</span>
+<span id="L112" class="LineNr">112 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;return&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L113" class="LineNr">113 </span>  --<span class="Special">Callstack_depth</span><span class="Delimiter">;</span>
+<span id="L114" class="LineNr">114 </span>  EIP = <a href='013direct_addressing.cc.html#L960'>pop</a><span class="Delimiter">();</span>
+<span id="L115" class="LineNr">115 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L440'>HEXWORD</a> &lt;&lt; EIP &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L116" class="LineNr">116 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L117" class="LineNr">117 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/020syscalls.cc.html b/html/subx/020syscalls.cc.html
index 61932039..405da47a 100644
--- a/html/subx/020syscalls.cc.html
+++ b/html/subx/020syscalls.cc.html
@@ -59,15 +59,15 @@ if ('onhashchange' in window) {
 <a href='https://github.com/akkartik/mu/blob/master/subx/020syscalls.cc'>https://github.com/akkartik/mu/blob/master/subx/020syscalls.cc</a>
 <pre id='vimCodeElement'>
 <span id="L1" class="LineNr">  1 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L2" class="LineNr">  2 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;cd&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;software interrupt (int)&quot;</span><span class="Delimiter">);</span>
+<span id="L2" class="LineNr">  2 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;cd&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;software interrupt (int)&quot;</span><span class="Delimiter">);</span>
 <span id="L3" class="LineNr">  3 </span>
 <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#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; end<span class="Delimiter">();</span>
-<span id="L7" class="LineNr">  7 </span>  <span class="Normal">uint8_t</span> <a href='031check_operands.cc.html#L11'>code</a> = <a href='010---vm.cc.html#L363'>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#L11'>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#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;Unimplemented interrupt <a href='031check_operands.cc.html#L11'>code</a> &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L432'>HEXBYTE</a> &lt;&lt; <a href='031check_operands.cc.html#L11'>code</a> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L10" class="LineNr"> 10 </span>    <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;  Only `int 80h` supported for now.\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L6" class="LineNr">  6 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; end<span class="Delimiter">();</span>
+<span id="L7" class="LineNr">  7 </span>  <span class="Normal">uint8_t</span> code = <a href='010---vm.cc.html#L363'>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#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;Unimplemented interrupt code &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L439'>HEXBYTE</a> &lt;&lt; code &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L10" class="LineNr"> 10 </span>    <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;  Only `int 80h` supported for now.\n&quot;</span> &lt;&lt; end<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>
 <span id="L13" class="LineNr"> 13 </span>  <a href='020syscalls.cc.html#L18'>process_int80</a><span class="Delimiter">();</span>
@@ -78,73 +78,73 @@ 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><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[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 <a href='031check_operands.cc.html#L11'>code</a></span><span class="Comment">*/</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[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 code</span><span class="Comment">*/</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[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#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EDX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L24" class="LineNr"> 24 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EDX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L25" class="LineNr"> 25 </span>    <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = read<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">file descriptor</span><span class="Comment">*/</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">memory buffer</span><span class="Comment">*/</span><a href='010---vm.cc.html#L217'>mem_addr_u8</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">size</span><span class="Comment">*/</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EDX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L26" class="LineNr"> 26 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L27" class="LineNr"> 27 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L26" class="LineNr"> 26 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L27" class="LineNr"> 27 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<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="Normal">case</span> <span class="Constant">4</span>:
-<span id="L30" class="LineNr"> 30 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;write: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EDX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L31" class="LineNr"> 31 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L255'>mem_addr_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EDX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L30" class="LineNr"> 30 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;write: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EDX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L31" class="LineNr"> 31 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L255'>mem_addr_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EDX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L32" class="LineNr"> 32 </span>    <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = write<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">file descriptor</span><span class="Comment">*/</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">memory buffer</span><span class="Comment">*/</span><a href='010---vm.cc.html#L217'>mem_addr_u8</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">size</span><span class="Comment">*/</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EDX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L33" class="LineNr"> 33 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L34" class="LineNr"> 34 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L33" class="LineNr"> 33 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L34" class="LineNr"> 34 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L35" class="LineNr"> 35 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L36" class="LineNr"> 36 </span>  <span class="Normal">case</span> <span class="Constant">5</span>: <span class="Delimiter">{</span>
 <span id="L37" class="LineNr"> 37 </span>    <a href='020syscalls.cc.html#L93'>check_flags</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L14'>ECX</a><span class="Delimiter">);</span>
 <span id="L38" class="LineNr"> 38 </span>    <a href='020syscalls.cc.html#L105'>check_mode</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L15'>EDX</a><span class="Delimiter">);</span>
-<span id="L39" class="LineNr"> 39 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;open: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L40" class="LineNr"> 40 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L39" class="LineNr"> 39 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;open: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L40" class="LineNr"> 40 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L41" class="LineNr"> 41 </span>    <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = open<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">filename</span><span class="Comment">*/</span><a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">flags</span><span class="Comment">*/</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">mode</span><span class="Comment">*/</span><span class="PreProc">0</span><span class="Constant">640</span><span class="Delimiter">);</span>
-<span id="L42" class="LineNr"> 42 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L43" class="LineNr"> 43 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L42" class="LineNr"> 42 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L43" class="LineNr"> 43 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L44" class="LineNr"> 44 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L45" class="LineNr"> 45 </span>  <span class="Delimiter">}</span>
 <span id="L46" class="LineNr"> 46 </span>  <span class="Normal">case</span> <span class="Constant">6</span>:
-<span id="L47" class="LineNr"> 47 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;close: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L47" class="LineNr"> 47 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;close: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L48" class="LineNr"> 48 </span>    <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = close<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">file descriptor</span><span class="Comment">*/</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L49" class="LineNr"> 49 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L50" class="LineNr"> 50 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L49" class="LineNr"> 49 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L50" class="LineNr"> 50 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L51" class="LineNr"> 51 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L52" class="LineNr"> 52 </span>  <span class="Normal">case</span> <span class="Constant">8</span>:
 <span id="L53" class="LineNr"> 53 </span>    <a href='020syscalls.cc.html#L105'>check_mode</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L14'>ECX</a><span class="Delimiter">);</span>
-<span id="L54" class="LineNr"> 54 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;creat: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L55" class="LineNr"> 55 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L54" class="LineNr"> 54 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;creat: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L55" class="LineNr"> 55 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L56" class="LineNr"> 56 </span>    <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = creat<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">filename</span><span class="Comment">*/</span><a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">mode</span><span class="Comment">*/</span><span class="PreProc">0</span><span class="Constant">640</span><span class="Delimiter">);</span>
-<span id="L57" class="LineNr"> 57 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L58" class="LineNr"> 58 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L57" class="LineNr"> 57 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L58" class="LineNr"> 58 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L59" class="LineNr"> 59 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L60" class="LineNr"> 60 </span>  <span class="Normal">case</span> <span class="Constant">10</span>:
-<span id="L61" class="LineNr"> 61 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;unlink: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L62" class="LineNr"> 62 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L61" class="LineNr"> 61 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;unlink: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L62" class="LineNr"> 62 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L63" class="LineNr"> 63 </span>    <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = unlink<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">filename</span><span class="Comment">*/</span><a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">));</span>
-<span id="L64" class="LineNr"> 64 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L65" class="LineNr"> 65 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L64" class="LineNr"> 64 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L65" class="LineNr"> 65 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L66" class="LineNr"> 66 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L67" class="LineNr"> 67 </span>  <span class="Normal">case</span> <span class="Constant">38</span>:
-<span id="L68" class="LineNr"> 68 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;rename: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L69" class="LineNr"> 69 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L70" class="LineNr"> 70 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L68" class="LineNr"> 68 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;rename: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L69" class="LineNr"> 69 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L70" class="LineNr"> 70 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L71" class="LineNr"> 71 </span>    <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = rename<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">old filename</span><span class="Comment">*/</span><a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">new filename</span><span class="Comment">*/</span><a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">));</span>
-<span id="L72" class="LineNr"> 72 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L73" class="LineNr"> 73 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L72" class="LineNr"> 72 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L73" class="LineNr"> 73 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L74" class="LineNr"> 74 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L75" class="LineNr"> 75 </span>  <span class="Normal">case</span> <span class="Constant">45</span>:  <span class="Comment">// brk: modify size of data segment</span>
-<span id="L76" class="LineNr"> 76 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;grow data segment to &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L76" class="LineNr"> 76 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;grow data segment to &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L77" class="LineNr"> 77 </span>    <a href='010---vm.cc.html#L189'>grow_data_segment</a><span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">new end address</span><span class="Comment">*/</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
 <span id="L78" class="LineNr"> 78 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L79" class="LineNr"> 79 </span>  <span class="Normal">case</span> <span class="Constant">90</span>:  <span class="Comment">// mmap: allocate memory outside existing segment allocations</span>
-<span id="L80" class="LineNr"> 80 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;mmap: allocate new segment&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L80" class="LineNr"> 80 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;mmap: allocate new segment&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L81" class="LineNr"> 81 </span>    <span class="Comment">// Ignore most arguments for now: address hint, protection flags, sharing flags, fd, offset.</span>
 <span id="L82" class="LineNr"> 82 </span>    <span class="Comment">// We only support anonymous maps.</span>
 <span id="L83" class="LineNr"> 83 </span>    <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>u = <a href='020syscalls.cc.html#L116'>new_segment</a><span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">length</span><span class="Comment">*/</span><a href='010---vm.cc.html#L209'>read_mem_u32</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u+<span class="Constant">0x4</span><span class="Delimiter">));</span>
-<span id="L84" class="LineNr"> 84 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L84" class="LineNr"> 84 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L85" class="LineNr"> 85 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L86" class="LineNr"> 86 </span>  <span class="Normal">default</span>:
-<span id="L87" class="LineNr"> 87 </span>    <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; EIP &lt;&lt; <span class="Constant">&quot;: unimplemented syscall &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>u &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L87" class="LineNr"> 87 </span>    <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; EIP &lt;&lt; <span class="Constant">&quot;: unimplemented syscall &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>u &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L88" class="LineNr"> 88 </span>  <span class="Delimiter">}</span>
 <span id="L89" class="LineNr"> 89 </span><span class="Delimiter">}</span>
 <span id="L90" class="LineNr"> 90 </span>
@@ -153,18 +153,18 @@ if ('onhashchange' in window) {
 <span id="L93" class="LineNr"> 93 </span><span class="Normal">void</span> <a href='020syscalls.cc.html#L93'>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="L94" class="LineNr"> 94 </span>  <span class="Normal">uint32_t</span> flags = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
 <span id="L95" class="LineNr"> 95 </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="L96" class="LineNr"> 96 </span>    cerr &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; EIP &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.\n&quot;</span><span class="Delimiter">;</span>
+<span id="L96" class="LineNr"> 96 </span>    cerr &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; EIP &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.\n&quot;</span><span class="Delimiter">;</span>
 <span id="L97" class="LineNr"> 97 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</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">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="L100" class="LineNr">100 </span>    cerr &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; EIP &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>.\n&quot;</span><span class="Delimiter">;</span>
+<span id="L100" class="LineNr">100 </span>    cerr &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; EIP &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>.\n&quot;</span><span class="Delimiter">;</span>
 <span id="L101" class="LineNr">101 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L102" class="LineNr">102 </span>  <span class="Delimiter">}</span>
 <span id="L103" class="LineNr">103 </span><span class="Delimiter">}</span>
 <span id="L104" class="LineNr">104 </span>
 <span id="L105" class="LineNr">105 </span><span class="Normal">void</span> <a href='020syscalls.cc.html#L105'>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="L106" class="LineNr">106 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u != <span class="PreProc">0</span><span class="Constant">600</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L107" class="LineNr">107 </span>    cerr &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; EIP &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.\n&quot;</span><span class="Delimiter">;</span>
+<span id="L107" class="LineNr">107 </span>    cerr &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; EIP &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.\n&quot;</span><span class="Delimiter">;</span>
 <span id="L108" class="LineNr">108 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L109" class="LineNr">109 </span>  <span class="Delimiter">}</span>
 <span id="L110" class="LineNr">110 </span><span class="Delimiter">}</span>
diff --git a/html/subx/021byte_addressing.cc.html b/html/subx/021byte_addressing.cc.html
index 89f9bc9c..bc2667ce 100644
--- a/html/subx/021byte_addressing.cc.html
+++ b/html/subx/021byte_addressing.cc.html
@@ -14,8 +14,6 @@ pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-
 body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
-.traceContains { color: #005f00; }
-.PreProc { color: #c000c0; }
 .LineNr { }
 .Constant { color: #008787; }
 .Delimiter { color: #c000c0; }
@@ -75,7 +73,7 @@ if ('onhashchange' in window) {
 <span id="L14" class="LineNr"> 14 </span>  <span class="Normal">case</span> <span class="Constant">5</span>: <span class="Identifier">return</span> <span class="Constant">&quot;CH&quot;</span><span class="Delimiter">;</span>  <span class="Comment">// second lowest byte of ECX</span>
 <span id="L15" class="LineNr"> 15 </span>  <span class="Normal">case</span> <span class="Constant">6</span>: <span class="Identifier">return</span> <span class="Constant">&quot;DH&quot;</span><span class="Delimiter">;</span>  <span class="Comment">// second lowest byte of EDX</span>
 <span id="L16" class="LineNr"> 16 </span>  <span class="Normal">case</span> <span class="Constant">7</span>: <span class="Identifier">return</span> <span class="Constant">&quot;BH&quot;</span><span class="Delimiter">;</span>  <span class="Comment">// second lowest byte of EBX</span>
-<span id="L17" class="LineNr"> 17 </span>  <span class="Normal">default</span>: <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid 8-bit register &quot;</span> &lt;&lt; r &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>  <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L17" class="LineNr"> 17 </span>  <span class="Normal">default</span>: <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid 8-bit register &quot;</span> &lt;&lt; r &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>  <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
 <span id="L18" class="LineNr"> 18 </span>  <span class="Delimiter">}</span>
 <span id="L19" class="LineNr"> 19 </span><span class="Delimiter">}</span>
 <span id="L20" class="LineNr"> 20 </span>
@@ -84,11 +82,11 @@ if ('onhashchange' in window) {
 <span id="L23" class="LineNr"> 23 </span>  <span class="Normal">uint8_t</span> rm = modrm &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
 <span id="L24" class="LineNr"> 24 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>mod == <span class="Constant">3</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L25" class="LineNr"> 25 </span>    <span class="Comment">// select an 8-bit register</span>
-<span id="L26" class="LineNr"> 26 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;r/m8 is &quot;</span> &lt;&lt; <a href='021byte_addressing.cc.html#L7'>rname_8bit</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L26" class="LineNr"> 26 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;r/m8 is &quot;</span> &lt;&lt; <a href='021byte_addressing.cc.html#L7'>rname_8bit</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L27" class="LineNr"> 27 </span>    <span class="Identifier">return</span> <a href='021byte_addressing.cc.html#L33'>reg_8bit</a><span class="Delimiter">(</span>rm<span class="Delimiter">);</span>
 <span id="L28" class="LineNr"> 28 </span>  <span class="Delimiter">}</span>
 <span id="L29" class="LineNr"> 29 </span>  <span class="Comment">// the rest is as usual</span>
-<span id="L30" class="LineNr"> 30 </span>  <span class="Identifier">return</span> <a href='010---vm.cc.html#L217'>mem_addr_u8</a><span class="Delimiter">(</span><a href='013direct_addressing.cc.html#L43'>effective_address_number</a><span class="Delimiter">(</span>modrm<span class="Delimiter">));</span>
+<span id="L30" class="LineNr"> 30 </span>  <span class="Identifier">return</span> <a href='010---vm.cc.html#L217'>mem_addr_u8</a><span class="Delimiter">(</span><a href='013direct_addressing.cc.html#L53'>effective_address_number</a><span class="Delimiter">(</span>modrm<span class="Delimiter">));</span>
 <span id="L31" class="LineNr"> 31 </span><span class="Delimiter">}</span>
 <span id="L32" class="LineNr"> 32 </span>
 <span id="L33" class="LineNr"> 33 </span><span class="Normal">uint8_t</span>* <a href='021byte_addressing.cc.html#L33'>reg_8bit</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> rm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -99,118 +97,142 @@ if ('onhashchange' in window) {
 <span id="L38" class="LineNr"> 38 </span><span class="Delimiter">}</span>
 <span id="L39" class="LineNr"> 39 </span>
 <span id="L40" class="LineNr"> 40 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L41" class="LineNr"> 41 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;88&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy r8 to r8/m8-at-r32&quot;</span><span class="Delimiter">);</span>
+<span id="L41" class="LineNr"> 41 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;88&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy r8 to r8/m8-at-r32&quot;</span><span class="Delimiter">);</span>
 <span id="L42" class="LineNr"> 42 </span>
-<span id="L43" class="LineNr"> 43 </span><span class="Delimiter">:(scenario copy_r8_to_mem_at_r32)</span>
-<span id="L44" class="LineNr"> 44 </span><span class="Special">% Reg[EBX].i = 0x224488ab;</span>
-<span id="L45" class="LineNr"> 45 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
-<span id="L46" class="LineNr"> 46 </span>== <span class="Constant">0x1</span>
-<span id="L47" class="LineNr"> 47 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L48" class="LineNr"> 48 </span>  <span class="Constant">88</span>  <span class="Constant">18</span>                                      <span class="Comment"># copy BL to the byte at *EAX</span>
-<span id="L49" class="LineNr"> 49 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src BL) 000 (dest EAX)</span>
-<span id="L50" class="LineNr"> 50 </span>== <span class="Constant">0x2000</span>
-<span id="L51" class="LineNr"> 51 </span>f0 cc bb aa
-<span id="L52" class="LineNr"> 52 </span><span class="traceContains">+run: copy BL to r8/m8-at-r32</span>
-<span id="L53" class="LineNr"> 53 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span>
-<span id="L54" class="LineNr"> 54 </span><span class="traceContains">+run: storing 0xab</span>
-<span id="L55" class="LineNr"> 55 </span><span class="Special">% CHECK_EQ(0xaabbccab, read_mem_u32(0x2000));</span>
-<span id="L56" class="LineNr"> 56 </span>
-<span id="L57" class="LineNr"> 57 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L58" class="LineNr"> 58 </span><span class="Normal">case</span> <span class="Constant">0x88</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy r8 to r/m8</span>
-<span id="L59" class="LineNr"> 59 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L60" class="LineNr"> 60 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> rsrc = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L61" class="LineNr"> 61 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy &quot;</span> &lt;&lt; <a href='021byte_addressing.cc.html#L7'>rname_8bit</a><span class="Delimiter">(</span>rsrc<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to r8/m8-at-r32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L62" class="LineNr"> 62 </span>  <span class="Comment">// use unsigned to zero-extend 8-bit value to 32 bits</span>
-<span id="L63" class="LineNr"> 63 </span>  <span class="Normal">uint8_t</span>* dest = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint8_t</span>*&gt;<span class="Delimiter">(</span><a href='021byte_addressing.cc.html#L21'>effective_byte_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">));</span>
-<span id="L64" class="LineNr"> 64 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span>* src = <a href='021byte_addressing.cc.html#L33'>reg_8bit</a><span class="Delimiter">(</span>rsrc<span class="Delimiter">);</span>
-<span id="L65" class="LineNr"> 65 </span>  *dest = *src<span class="Delimiter">;</span>
-<span id="L66" class="LineNr"> 66 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L432'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>*dest<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L67" class="LineNr"> 67 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L68" class="LineNr"> 68 </span><span class="Delimiter">}</span>
-<span id="L69" class="LineNr"> 69 </span>
-<span id="L70" class="LineNr"> 70 </span><span class="Comment">//:</span>
-<span id="L71" class="LineNr"> 71 </span>
-<span id="L72" class="LineNr"> 72 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L73" class="LineNr"> 73 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><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&quot;</span><span class="Delimiter">);</span>
-<span id="L74" class="LineNr"> 74 </span>
-<span id="L75" class="LineNr"> 75 </span><span class="Delimiter">:(scenario copy_mem_at_r32_to_r8)</span>
-<span id="L76" class="LineNr"> 76 </span><span class="Special">% Reg[EBX].i = 0xaabbcc0f;  // one nibble each of lowest byte set to all 0s and all 1s, to maximize value of this test</span>
-<span id="L77" class="LineNr"> 77 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
-<span id="L78" class="LineNr"> 78 </span>== <span class="Constant">0x1</span>
-<span id="L79" class="LineNr"> 79 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L80" class="LineNr"> 80 </span>  8a  <span class="Constant">18</span>                                      <span class="Comment"># copy just the byte at *EAX to BL</span>
-<span id="L81" class="LineNr"> 81 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (dest EBX) 000 (src EAX)</span>
-<span id="L82" class="LineNr"> 82 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L83" class="LineNr"> 83 </span>ab ff ff ff  <span class="Comment"># 0xab with more data in following bytes</span>
-<span id="L84" class="LineNr"> 84 </span><span class="traceContains">+run: copy r8/m8-at-r32 to BL</span>
-<span id="L85" class="LineNr"> 85 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span>
-<span id="L86" class="LineNr"> 86 </span><span class="traceContains">+run: storing 0xab</span>
-<span id="L87" class="LineNr"> 87 </span><span class="Comment"># remaining bytes of EBX are *not* cleared</span>
-<span id="L88" class="LineNr"> 88 </span><span class="traceContains">+run: <a href='010---vm.cc.html#L16'>EBX</a> now contains 0xaabbccab</span>
-<span id="L89" class="LineNr"> 89 </span>
-<span id="L90" class="LineNr"> 90 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L91" class="LineNr"> 91 </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="L92" class="LineNr"> 92 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L93" class="LineNr"> 93 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> rdest = <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="L94" class="LineNr"> 94 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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 &quot;</span> &lt;&lt; <a href='021byte_addressing.cc.html#L7'>rname_8bit</a><span class="Delimiter">(</span>rdest<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L95" class="LineNr"> 95 </span>  <span class="Comment">// use unsigned to zero-extend 8-bit value to 32 bits</span>
-<span id="L96" class="LineNr"> 96 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span>* src = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint8_t</span>*&gt;<span class="Delimiter">(</span><a href='021byte_addressing.cc.html#L21'>effective_byte_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">));</span>
-<span id="L97" class="LineNr"> 97 </span>  <span class="Normal">uint8_t</span>* dest = <a href='021byte_addressing.cc.html#L33'>reg_8bit</a><span class="Delimiter">(</span>rdest<span class="Delimiter">);</span>
-<span id="L98" class="LineNr"> 98 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L432'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>*src<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L99" class="LineNr"> 99 </span>  *dest = *src<span class="Delimiter">;</span>
-<span id="L100" class="LineNr">100 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> rdest_32bit = rdest &amp; <span class="Constant">0x3</span><span class="Delimiter">;</span>
-<span id="L101" class="LineNr">101 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <a href='013direct_addressing.cc.html#L63'>rname</a><span class="Delimiter">(</span>rdest_32bit<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; now contains 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rdest_32bit]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L102" class="LineNr">102 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L103" class="LineNr">103 </span><span class="Delimiter">}</span>
-<span id="L104" class="LineNr">104 </span>
-<span id="L105" class="LineNr">105 </span><span class="Delimiter">:(scenario cannot_copy_byte_to_ESP_EBP_ESI_EDI)</span>
-<span id="L106" class="LineNr">106 </span><span class="Special">% Reg[ESI].u = 0xaabbccdd;</span>
-<span id="L107" class="LineNr">107 </span><span class="Special">% Reg[EBX].u = 0x11223344;</span>
-<span id="L108" class="LineNr">108 </span>== <span class="Constant">0x1</span>
-<span id="L109" class="LineNr">109 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L110" class="LineNr">110 </span>  8a  f3                                      <span class="Comment"># copy just the byte at *EBX to 8-bit register '6'</span>
-<span id="L111" class="LineNr">111 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 110 (dest 8-bit 'register 6') 011 (src EBX)</span>
-<span id="L112" class="LineNr">112 </span><span class="Comment"># ensure 8-bit register '6' is DH, not ESI</span>
-<span id="L113" class="LineNr">113 </span><span class="traceContains">+run: copy r8/m8-at-r32 to DH</span>
-<span id="L114" class="LineNr">114 </span><span class="traceContains">+run: storing 0x44</span>
-<span id="L115" class="LineNr">115 </span><span class="Comment"># ensure ESI is unchanged</span>
-<span id="L116" class="LineNr">116 </span><span class="Special">% CHECK_EQ(Reg[ESI].u, 0xaabbccdd);</span>
-<span id="L117" class="LineNr">117 </span>
-<span id="L118" class="LineNr">118 </span><span class="Comment">//:</span>
-<span id="L119" class="LineNr">119 </span>
-<span id="L120" class="LineNr">120 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L121" class="LineNr">121 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c6&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm8 to r8/m8-at-r32 (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L122" class="LineNr">122 </span>
-<span id="L123" class="LineNr">123 </span><span class="Delimiter">:(scenario copy_imm8_to_mem_at_r32)</span>
-<span id="L124" class="LineNr">124 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
-<span id="L125" class="LineNr">125 </span>== <span class="Constant">0x1</span>
-<span id="L126" class="LineNr">126 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L127" class="LineNr">127 </span>  c6  <span class="PreProc">0</span><span class="Constant">0</span>                          dd          <span class="Comment"># copy to the byte at *EAX</span>
-<span id="L128" class="LineNr">128 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 000 (unused) 000 (dest EAX)</span>
-<span id="L129" class="LineNr">129 </span>== <span class="Constant">0x2000</span>
-<span id="L130" class="LineNr">130 </span>f0 cc bb aa
-<span id="L131" class="LineNr">131 </span><span class="traceContains">+run: copy imm8 to r8/m8-at-r32</span>
-<span id="L132" class="LineNr">132 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span>
-<span id="L133" class="LineNr">133 </span><span class="traceContains">+run: storing 0xdd</span>
-<span id="L134" class="LineNr">134 </span><span class="Special">% CHECK_EQ(0xaabbccdd, read_mem_u32(0x2000));</span>
+<span id="L43" class="LineNr"> 43 </span><span class="Delimiter">:(code)</span>
+<span id="L44" class="LineNr"> 44 </span><span class="Normal">void</span> <a href='021byte_addressing.cc.html#L44'>test_copy_r8_to_mem_at_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L45" class="LineNr"> 45 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0x224488ab</span><span class="Delimiter">;</span>
+<span id="L46" class="LineNr"> 46 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L47" class="LineNr"> 47 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L48" class="LineNr"> 48 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L49" class="LineNr"> 49 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L50" class="LineNr"> 50 </span>      <span class="Constant">&quot;  88     18                                      \n&quot;</span>  <span class="Comment">// copy BL to the byte at *EAX</span>
+<span id="L51" class="LineNr"> 51 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 011 (src BL) 000 (dest EAX)</span>
+<span id="L52" class="LineNr"> 52 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L53" class="LineNr"> 53 </span>      <span class="Constant">&quot;f0 cc bb aa\n&quot;</span>
+<span id="L54" class="LineNr"> 54 </span>  <span class="Delimiter">);</span>
+<span id="L55" class="LineNr"> 55 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L56" class="LineNr"> 56 </span>      <span class="Constant">&quot;run: copy BL to r8/m8-at-r32\n&quot;</span>
+<span id="L57" class="LineNr"> 57 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EAX)\n&quot;</span>
+<span id="L58" class="LineNr"> 58 </span>      <span class="Constant">&quot;run: storing 0xab\n&quot;</span>
+<span id="L59" class="LineNr"> 59 </span>  <span class="Delimiter">);</span>
+<span id="L60" class="LineNr"> 60 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><span class="Constant">0xaabbccab</span><span class="Delimiter">,</span> <a href='010---vm.cc.html#L209'>read_mem_u32</a><span class="Delimiter">(</span><span class="Constant">0x2000</span><span class="Delimiter">));</span>
+<span id="L61" class="LineNr"> 61 </span><span class="Delimiter">}</span>
+<span id="L62" class="LineNr"> 62 </span>
+<span id="L63" class="LineNr"> 63 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L64" class="LineNr"> 64 </span><span class="Normal">case</span> <span class="Constant">0x88</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy r8 to r/m8</span>
+<span id="L65" class="LineNr"> 65 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
+<span id="L66" class="LineNr"> 66 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> rsrc = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L67" class="LineNr"> 67 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy &quot;</span> &lt;&lt; <a href='021byte_addressing.cc.html#L7'>rname_8bit</a><span class="Delimiter">(</span>rsrc<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to r8/m8-at-r32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L68" class="LineNr"> 68 </span>  <span class="Comment">// use unsigned to zero-extend 8-bit value to 32 bits</span>
+<span id="L69" class="LineNr"> 69 </span>  <span class="Normal">uint8_t</span>* dest = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint8_t</span>*&gt;<span class="Delimiter">(</span><a href='021byte_addressing.cc.html#L21'>effective_byte_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">));</span>
+<span id="L70" class="LineNr"> 70 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span>* src = <a href='021byte_addressing.cc.html#L33'>reg_8bit</a><span class="Delimiter">(</span>rsrc<span class="Delimiter">);</span>
+<span id="L71" class="LineNr"> 71 </span>  *dest = *src<span class="Delimiter">;</span>
+<span id="L72" class="LineNr"> 72 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L439'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span>*dest<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L73" class="LineNr"> 73 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L74" class="LineNr"> 74 </span><span class="Delimiter">}</span>
+<span id="L75" class="LineNr"> 75 </span>
+<span id="L76" class="LineNr"> 76 </span><span class="Comment">//:</span>
+<span id="L77" class="LineNr"> 77 </span>
+<span id="L78" class="LineNr"> 78 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L79" class="LineNr"> 79 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><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&quot;</span><span class="Delimiter">);</span>
+<span id="L80" class="LineNr"> 80 </span>
+<span id="L81" class="LineNr"> 81 </span><span class="Delimiter">:(code)</span>
+<span id="L82" class="LineNr"> 82 </span><span class="Normal">void</span> <a href='021byte_addressing.cc.html#L82'>test_copy_mem_at_r32_to_r8</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L83" class="LineNr"> 83 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>i = <span class="Constant">0xaabbcc0f</span><span class="Delimiter">;</span>  <span class="Comment">// one nibble each of lowest byte set to all 0s and all 1s, to maximize value of this test</span>
+<span id="L84" class="LineNr"> 84 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L85" class="LineNr"> 85 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L86" class="LineNr"> 86 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L87" class="LineNr"> 87 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L88" class="LineNr"> 88 </span>      <span class="Constant">&quot;  8a     18                                      \n&quot;</span>  <span class="Comment">// copy just the byte at *EAX to BL</span>
+<span id="L89" class="LineNr"> 89 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 011 (dest EBX) 000 (src EAX)</span>
+<span id="L90" class="LineNr"> 90 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L91" class="LineNr"> 91 </span>      <span class="Constant">&quot;ab ff ff ff\n&quot;</span>  <span class="Comment">// 0xab with more data in following bytes</span>
+<span id="L92" class="LineNr"> 92 </span>  <span class="Delimiter">);</span>
+<span id="L93" class="LineNr"> 93 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L94" class="LineNr"> 94 </span>      <span class="Constant">&quot;run: copy r8/m8-at-r32 to BL\n&quot;</span>
+<span id="L95" class="LineNr"> 95 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EAX)\n&quot;</span>
+<span id="L96" class="LineNr"> 96 </span>      <span class="Constant">&quot;run: storing 0xab\n&quot;</span>
+<span id="L97" class="LineNr"> 97 </span>      <span class="Comment">// remaining bytes of EBX are *not* cleared</span>
+<span id="L98" class="LineNr"> 98 </span>      <span class="Constant">&quot;run: <a href='010---vm.cc.html#L16'>EBX</a> now contains 0xaabbccab\n&quot;</span>
+<span id="L99" class="LineNr"> 99 </span>  <span class="Delimiter">);</span>
+<span id="L100" class="LineNr">100 </span><span class="Delimiter">}</span>
+<span id="L101" class="LineNr">101 </span>
+<span id="L102" class="LineNr">102 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L103" class="LineNr">103 </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="L104" class="LineNr">104 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
+<span id="L105" class="LineNr">105 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> rdest = <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="L106" class="LineNr">106 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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 &quot;</span> &lt;&lt; <a href='021byte_addressing.cc.html#L7'>rname_8bit</a><span class="Delimiter">(</span>rdest<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L107" class="LineNr">107 </span>  <span class="Comment">// use unsigned to zero-extend 8-bit value to 32 bits</span>
+<span id="L108" class="LineNr">108 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span>* src = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint8_t</span>*&gt;<span class="Delimiter">(</span><a href='021byte_addressing.cc.html#L21'>effective_byte_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">));</span>
+<span id="L109" class="LineNr">109 </span>  <span class="Normal">uint8_t</span>* dest = <a href='021byte_addressing.cc.html#L33'>reg_8bit</a><span class="Delimiter">(</span>rdest<span class="Delimiter">);</span>
+<span id="L110" class="LineNr">110 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L439'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span>*src<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L111" class="LineNr">111 </span>  *dest = *src<span class="Delimiter">;</span>
+<span id="L112" class="LineNr">112 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> rdest_32bit = rdest &amp; <span class="Constant">0x3</span><span class="Delimiter">;</span>
+<span id="L113" class="LineNr">113 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <a href='013direct_addressing.cc.html#L73'>rname</a><span class="Delimiter">(</span>rdest_32bit<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; now contains 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rdest_32bit]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L114" class="LineNr">114 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L115" class="LineNr">115 </span><span class="Delimiter">}</span>
+<span id="L116" class="LineNr">116 </span>
+<span id="L117" class="LineNr">117 </span><span class="Delimiter">:(code)</span>
+<span id="L118" class="LineNr">118 </span><span class="Normal">void</span> <a href='021byte_addressing.cc.html#L118'>test_cannot_copy_byte_to_ESP_EBP_ESI_EDI</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L119" class="LineNr">119 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESI]<span class="Delimiter">.</span>u = <span class="Constant">0xaabbccdd</span><span class="Delimiter">;</span>
+<span id="L120" class="LineNr">120 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u = <span class="Constant">0x11223344</span><span class="Delimiter">;</span>
+<span id="L121" class="LineNr">121 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L122" class="LineNr">122 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L123" class="LineNr">123 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L124" class="LineNr">124 </span>      <span class="Constant">&quot;  8a     f3                                      \n&quot;</span>  <span class="Comment">// copy just the byte at *EBX to 8-bit register '6'</span>
+<span id="L125" class="LineNr">125 </span>      <span class="Comment">// ModR/M in binary: 11 (direct mode) 110 (dest 8-bit 'register 6') 011 (src EBX)</span>
+<span id="L126" class="LineNr">126 </span>  <span class="Delimiter">);</span>
+<span id="L127" class="LineNr">127 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L128" class="LineNr">128 </span>      <span class="Comment">// ensure 8-bit register '6' is DH, not ESI</span>
+<span id="L129" class="LineNr">129 </span>      <span class="Constant">&quot;run: copy r8/m8-at-r32 to DH\n&quot;</span>
+<span id="L130" class="LineNr">130 </span>      <span class="Constant">&quot;run: storing 0x44\n&quot;</span>
+<span id="L131" class="LineNr">131 </span>  <span class="Delimiter">);</span>
+<span id="L132" class="LineNr">132 </span>  <span class="Comment">// ensure ESI is unchanged</span>
+<span id="L133" class="LineNr">133 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESI]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> <span class="Constant">0xaabbccdd</span><span class="Delimiter">);</span>
+<span id="L134" class="LineNr">134 </span><span class="Delimiter">}</span>
 <span id="L135" class="LineNr">135 </span>
-<span id="L136" class="LineNr">136 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L137" class="LineNr">137 </span><span class="Normal">case</span> <span class="Constant">0xc6</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy imm8 to r/m8</span>
-<span id="L138" class="LineNr">138 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L139" class="LineNr">139 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> src = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
-<span id="L140" class="LineNr">140 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy imm8 to r8/m8-at-r32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L141" class="LineNr">141 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;imm8 is 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; src &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L142" class="LineNr">142 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
-<span id="L143" class="LineNr">143 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>subop != <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L144" class="LineNr">144 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized subop for opcode c6: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; (only 0/copy currently implemented)\n&quot;</span><span class="Delimiter">;</span>
-<span id="L145" class="LineNr">145 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L146" class="LineNr">146 </span>  <span class="Delimiter">}</span>
-<span id="L147" class="LineNr">147 </span>  <span class="Comment">// use unsigned to zero-extend 8-bit value to 32 bits</span>
-<span id="L148" class="LineNr">148 </span>  <span class="Normal">uint8_t</span>* dest = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint8_t</span>*&gt;<span class="Delimiter">(</span><a href='021byte_addressing.cc.html#L21'>effective_byte_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">));</span>
-<span id="L149" class="LineNr">149 </span>  *dest = src<span class="Delimiter">;</span>
-<span id="L150" class="LineNr">150 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L432'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>*dest<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L151" class="LineNr">151 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L152" class="LineNr">152 </span><span class="Delimiter">}</span>
+<span id="L136" class="LineNr">136 </span><span class="Comment">//:</span>
+<span id="L137" class="LineNr">137 </span>
+<span id="L138" class="LineNr">138 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L139" class="LineNr">139 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c6&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm8 to r8/m8-at-r32 (mov)&quot;</span><span class="Delimiter">);</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> <a href='021byte_addressing.cc.html#L142'>test_copy_imm8_to_mem_at_r32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L143" class="LineNr">143 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = <span class="Constant">0x2000</span><span class="Delimiter">;</span>
+<span id="L144" class="LineNr">144 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L145" class="LineNr">145 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L146" class="LineNr">146 </span>      <span class="Comment">// op     ModR/M  SIB   displacement  immediate</span>
+<span id="L147" class="LineNr">147 </span>      <span class="Constant">&quot;  c6     00                          dd          \n&quot;</span>  <span class="Comment">// copy to the byte at *EAX</span>
+<span id="L148" class="LineNr">148 </span>      <span class="Comment">// ModR/M in binary: 00 (indirect mode) 000 (unused) 000 (dest EAX)</span>
+<span id="L149" class="LineNr">149 </span>      <span class="Constant">&quot;== 0x2000\n&quot;</span>  <span class="Comment">// data segment</span>
+<span id="L150" class="LineNr">150 </span>      <span class="Constant">&quot;f0 cc bb aa\n&quot;</span>
+<span id="L151" class="LineNr">151 </span>  <span class="Delimiter">);</span>
+<span id="L152" class="LineNr">152 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L153" class="LineNr">153 </span>      <span class="Constant">&quot;run: copy imm8 to r8/m8-at-r32\n&quot;</span>
+<span id="L154" class="LineNr">154 </span>      <span class="Constant">&quot;run: effective address is 0x00002000 (EAX)\n&quot;</span>
+<span id="L155" class="LineNr">155 </span>      <span class="Constant">&quot;run: storing 0xdd\n&quot;</span>
+<span id="L156" class="LineNr">156 </span>  <span class="Delimiter">);</span>
+<span id="L157" class="LineNr">157 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><span class="Constant">0xaabbccdd</span><span class="Delimiter">,</span> <a href='010---vm.cc.html#L209'>read_mem_u32</a><span class="Delimiter">(</span><span class="Constant">0x2000</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 Single-Byte Opcodes&quot;)</span>
+<span id="L161" class="LineNr">161 </span><span class="Normal">case</span> <span class="Constant">0xc6</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy imm8 to r/m8</span>
+<span id="L162" class="LineNr">162 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
+<span id="L163" class="LineNr">163 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> src = <a href='010---vm.cc.html#L363'>next</a><span class="Delimiter">();</span>
+<span id="L164" class="LineNr">164 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy imm8 to r8/m8-at-r32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L165" class="LineNr">165 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;imm8 is 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; src &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L166" class="LineNr">166 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
+<span id="L167" class="LineNr">167 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>subop != <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L168" class="LineNr">168 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized subop for opcode c6: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; (only 0/copy currently implemented)\n&quot;</span><span class="Delimiter">;</span>
+<span id="L169" class="LineNr">169 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L170" class="LineNr">170 </span>  <span class="Delimiter">}</span>
+<span id="L171" class="LineNr">171 </span>  <span class="Comment">// use unsigned to zero-extend 8-bit value to 32 bits</span>
+<span id="L172" class="LineNr">172 </span>  <span class="Normal">uint8_t</span>* dest = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint8_t</span>*&gt;<span class="Delimiter">(</span><a href='021byte_addressing.cc.html#L21'>effective_byte_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">));</span>
+<span id="L173" class="LineNr">173 </span>  *dest = src<span class="Delimiter">;</span>
+<span id="L174" class="LineNr">174 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span>+<span class="Constant">1</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#L439'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span>*dest<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L175" class="LineNr">175 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L176" class="LineNr">176 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/028translate.cc.html b/html/subx/028translate.cc.html
index 4f340449..0788458f 100644
--- a/html/subx/028translate.cc.html
+++ b/html/subx/028translate.cc.html
@@ -14,11 +14,12 @@ pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-
 body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
+.PreProc { color: #c000c0; }
 .LineNr { }
 .Constant { color: #008787; }
-.Special { color: #d70000; }
-.Delimiter { color: #c000c0; }
 .SalientComment { color: #0000af; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
 .Identifier { color: #af5f00; }
 .Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 .Comment { color: #005faf; }
@@ -78,10 +79,10 @@ if ('onhashchange' in window) {
 <span id="L18" class="LineNr"> 18 </span>
 <span id="L19" class="LineNr"> 19 </span><span class="Delimiter">:(before &quot;End Main&quot;)</span>
 <span id="L20" class="LineNr"> 20 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L98'>is_equal</a><span class="Delimiter">(</span>argv[<span class="Constant">1</span>]<span class="Delimiter">,</span> <span class="Constant">&quot;translate&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L197'>START_TRACING_UNTIL_END_OF_SCOPE</a><span class="Delimiter">;</span>
+<span id="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L182'>START_TRACING_UNTIL_END_OF_SCOPE</a><span class="Delimiter">;</span>
 <span id="L22" class="LineNr"> 22 </span>  <a href='000organization.cc.html#L148'>reset</a><span class="Delimiter">();</span>
 <span id="L23" class="LineNr"> 23 </span>  <span class="Comment">// Begin subx translate</span>
-<span id="L24" class="LineNr"> 24 </span>  <a href='011run.cc.html#L95'>program</a> p<span class="Delimiter">;</span>
+<span id="L24" class="LineNr"> 24 </span>  <a href='011run.cc.html#L102'>program</a> p<span class="Delimiter">;</span>
 <span id="L25" class="LineNr"> 25 </span>  string output_filename<span class="Delimiter">;</span>
 <span id="L26" class="LineNr"> 26 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip 'subx translate'</span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">;</span>  i &lt; argc<span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L27" class="LineNr"> 27 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L98'>is_equal</a><span class="Delimiter">(</span>argv[i]<span class="Delimiter">,</span> <span class="Constant">&quot;-o&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
@@ -94,17 +95,17 @@ if ('onhashchange' in window) {
 <span id="L34" class="LineNr"> 34 </span>      output_filename = argv[i]<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">else</span> <span class="Delimiter">{</span>
-<span id="L37" class="LineNr"> 37 </span>      <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; argv[i] &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L37" class="LineNr"> 37 </span>      <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; argv[i] &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L38" class="LineNr"> 38 </span>      ifstream fin<span class="Delimiter">(</span>argv[i]<span class="Delimiter">);</span>
 <span id="L39" class="LineNr"> 39 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!fin<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L40" class="LineNr"> 40 </span>        cerr &lt;&lt; <span class="Constant">&quot;could not open &quot;</span> &lt;&lt; argv[i] &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
 <span id="L41" class="LineNr"> 41 </span>        <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L42" class="LineNr"> 42 </span>      <span class="Delimiter">}</span>
 <span id="L43" class="LineNr"> 43 </span>      parse<span class="Delimiter">(</span>fin<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
-<span id="L44" class="LineNr"> 44 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L230'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L44" class="LineNr"> 44 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L238'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L45" class="LineNr"> 45 </span>    <span class="Delimiter">}</span>
 <span id="L46" class="LineNr"> 46 </span>  <span class="Delimiter">}</span>
-<span id="L47" class="LineNr"> 47 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L47" class="LineNr"> 47 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L48" class="LineNr"> 48 </span>    <a href='028translate.cc.html#L71'>print_translate_usage</a><span class="Delimiter">();</span>
 <span id="L49" class="LineNr"> 49 </span>    cerr &lt;&lt; <span class="Constant">&quot;nothing to do; must provide at least one file to read\n&quot;</span><span class="Delimiter">;</span>
 <span id="L50" class="LineNr"> 50 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
@@ -114,12 +115,12 @@ if ('onhashchange' in window) {
 <span id="L54" class="LineNr"> 54 </span>    cerr &lt;&lt; <span class="Constant">&quot;must provide a filename to write to using '-o'\n&quot;</span><span class="Delimiter">;</span>
 <span id="L55" class="LineNr"> 55 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L56" class="LineNr"> 56 </span>  <span class="Delimiter">}</span>
-<span id="L57" class="LineNr"> 57 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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; end<span class="Delimiter">();</span>
-<span id="L58" class="LineNr"> 58 </span>  <a href='011run.cc.html#L227'>transform</a><span class="Delimiter">(</span>p<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#L230'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L60" class="LineNr"> 60 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;translate&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;begin&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L57" class="LineNr"> 57 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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; end<span class="Delimiter">();</span>
+<span id="L58" class="LineNr"> 58 </span>  transform<span class="Delimiter">(</span>p<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#L238'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L60" class="LineNr"> 60 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;translate&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;begin&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L61" class="LineNr"> 61 </span>  <a href='028translate.cc.html#L76'>save_elf</a><span class="Delimiter">(</span>p<span class="Delimiter">,</span> output_filename<span class="Delimiter">);</span>
-<span id="L62" class="LineNr"> 62 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L230'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L62" class="LineNr"> 62 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L238'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L63" class="LineNr"> 63 </span>    unlink<span class="Delimiter">(</span>output_filename<span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
 <span id="L64" class="LineNr"> 64 </span>    <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L65" class="LineNr"> 65 </span>  <span class="Delimiter">}</span>
@@ -136,16 +137,16 @@ if ('onhashchange' in window) {
 <span id="L76" class="LineNr"> 76 </span><span class="Normal">void</span> <a href='028translate.cc.html#L76'>save_elf</a><span class="Delimiter">(</span><span class="Normal">const</span> program&amp; p<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; filename<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L77" class="LineNr"> 77 </span>  ofstream out<span class="Delimiter">(</span>filename<span class="Delimiter">.</span>c_str<span class="Delimiter">(),</span> ios::binary<span class="Delimiter">);</span>
 <span id="L78" class="LineNr"> 78 </span>  <a href='028translate.cc.html#L84'>write_elf_header</a><span class="Delimiter">(</span>out<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
-<span id="L79" class="LineNr"> 79 </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#L96'>segments</a><span class="Delimiter">.</span>size<span class="Delimiter">();</span>  ++i<span class="Delimiter">)</span>
-<span id="L80" class="LineNr"> 80 </span>    <a href='028translate.cc.html#L179'>write_segment</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> out<span class="Delimiter">);</span>
+<span id="L79" class="LineNr"> 79 </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#L103'>segments</a><span class="Delimiter">.</span>size<span class="Delimiter">();</span>  ++i<span class="Delimiter">)</span>
+<span id="L80" class="LineNr"> 80 </span>    <a href='028translate.cc.html#L179'>write_segment</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> out<span class="Delimiter">);</span>
 <span id="L81" class="LineNr"> 81 </span>  out<span class="Delimiter">.</span>close<span class="Delimiter">();</span>
 <span id="L82" class="LineNr"> 82 </span><span class="Delimiter">}</span>
 <span id="L83" class="LineNr"> 83 </span>
 <span id="L84" class="LineNr"> 84 </span><span class="Normal">void</span> <a href='028translate.cc.html#L84'>write_elf_header</a><span class="Delimiter">(</span>ostream&amp; out<span class="Delimiter">,</span> <span class="Normal">const</span> program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L85" class="LineNr"> 85 </span>  <span class="Normal">char</span> c = <span class="cSpecial">'\0'</span><span class="Delimiter">;</span>
-<span id="L86" class="LineNr"> 86 </span><span class="Comment">#define O(X)  c = (X); out.write(&amp;c, sizeof(c))</span>
+<span id="L86" class="LineNr"> 86 </span><span class="PreProc">#define </span><span class="Special">O</span><span class="PreProc">(</span><span class="Special">X</span><span class="PreProc">)  c = (</span><span class="Special">X</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> out</span><span class="Delimiter">.</span><span class="PreProc">write(&amp;c</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Normal">sizeof</span><span class="PreProc">(c))</span>
 <span id="L87" class="LineNr"> 87 </span><span class="Comment">// host is required to be little-endian</span>
-<span id="L88" class="LineNr"> 88 </span><span class="Comment">#define emit(X)  out.write(reinterpret_cast&lt;const char*&gt;(&amp;X), sizeof(X))</span>
+<span id="L88" class="LineNr"> 88 </span><span class="PreProc">#define emit(</span><span class="Special">X</span><span class="PreProc">)  out</span><span class="Delimiter">.</span><span class="PreProc">write(</span><span class="Normal">reinterpret_cast</span><span class="PreProc">&lt;</span><span class="Normal">const</span><span class="PreProc"> </span><span class="Normal">char</span><span class="PreProc">*&gt;(&amp;</span><span class="Special">X</span><span class="PreProc">)</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Normal">sizeof</span><span class="PreProc">(</span><span class="Special">X</span><span class="PreProc">))</span>
 <span id="L89" class="LineNr"> 89 </span>  <span class="SalientComment">//// ehdr</span>
 <span id="L90" class="LineNr"> 90 </span>  <span class="Comment">// e_ident</span>
 <span id="L91" class="LineNr"> 91 </span>  <span class="Special">O</span><span class="Delimiter">(</span><span class="Constant">0x7f</span><span class="Delimiter">);</span> <span class="Special">O</span><span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">E</span><span class="Comment">*/</span><span class="Constant">0x45</span><span class="Delimiter">);</span> <span class="Special">O</span><span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">L</span><span class="Comment">*/</span><span class="Constant">0x4c</span><span class="Delimiter">);</span> <span class="Special">O</span><span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">F</span><span class="Comment">*/</span><span class="Constant">0x46</span><span class="Delimiter">);</span>
@@ -160,9 +161,9 @@ if ('onhashchange' in window) {
 <span id="L100" class="LineNr">100 </span>  <span class="Comment">// e_version</span>
 <span id="L101" class="LineNr">101 </span>  <span class="Special">O</span><span class="Delimiter">(</span><span class="Constant">0x01</span><span class="Delimiter">);</span> <span class="Special">O</span><span class="Delimiter">(</span><span class="Constant">0x00</span><span class="Delimiter">);</span> <span class="Special">O</span><span class="Delimiter">(</span><span class="Constant">0x00</span><span class="Delimiter">);</span> <span class="Special">O</span><span class="Delimiter">(</span><span class="Constant">0x00</span><span class="Delimiter">);</span>
 <span id="L102" class="LineNr">102 </span>  <span class="Comment">// e_entry</span>
-<span id="L103" class="LineNr">103 </span>  <span class="Normal">uint32_t</span> <a href='035labels.cc.html#L39'>e_entry</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>start<span class="Delimiter">;</span>  <span class="Comment">// convention</span>
+<span id="L103" class="LineNr">103 </span>  <span class="Normal">uint32_t</span> <a href='035labels.cc.html#L44'>e_entry</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>start<span class="Delimiter">;</span>  <span class="Comment">// convention</span>
 <span id="L104" class="LineNr">104 </span>  <span class="Comment">// Override e_entry</span>
-<span id="L105" class="LineNr">105 </span>  emit<span class="Delimiter">(</span><a href='035labels.cc.html#L39'>e_entry</a><span class="Delimiter">);</span>
+<span id="L105" class="LineNr">105 </span>  emit<span class="Delimiter">(</span><a href='035labels.cc.html#L44'>e_entry</a><span class="Delimiter">);</span>
 <span id="L106" class="LineNr">106 </span>  <span class="Comment">// e_phoff -- immediately after ELF header</span>
 <span id="L107" class="LineNr">107 </span>  <span class="Normal">uint32_t</span> e_phoff = <span class="Constant">0x34</span><span class="Delimiter">;</span>
 <span id="L108" class="LineNr">108 </span>  emit<span class="Delimiter">(</span>e_phoff<span class="Delimiter">);</span>
@@ -178,7 +179,7 @@ if ('onhashchange' in window) {
 <span id="L118" class="LineNr">118 </span>  <span class="Normal">uint16_t</span> e_phentsize = <span class="Constant">0x20</span><span class="Delimiter">;</span>
 <span id="L119" class="LineNr">119 </span>  emit<span class="Delimiter">(</span>e_phentsize<span class="Delimiter">);</span>
 <span id="L120" class="LineNr">120 </span>  <span class="Comment">// e_phnum</span>
-<span id="L121" class="LineNr">121 </span>  <span class="Normal">uint16_t</span> e_phnum = <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">);</span>
+<span id="L121" class="LineNr">121 </span>  <span class="Normal">uint16_t</span> e_phnum = <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">);</span>
 <span id="L122" class="LineNr">122 </span>  emit<span class="Delimiter">(</span>e_phnum<span class="Delimiter">);</span>
 <span id="L123" class="LineNr">123 </span>  <span class="Comment">// e_shentsize</span>
 <span id="L124" class="LineNr">124 </span>  <span class="Normal">uint16_t</span> dummy16 = <span class="Constant">0x0</span><span class="Delimiter">;</span>
@@ -188,8 +189,8 @@ if ('onhashchange' in window) {
 <span id="L128" class="LineNr">128 </span>  <span class="Comment">// e_shstrndx</span>
 <span id="L129" class="LineNr">129 </span>  emit<span class="Delimiter">(</span>dummy16<span class="Delimiter">);</span>
 <span id="L130" class="LineNr">130 </span>
-<span id="L131" class="LineNr">131 </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#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>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="L132" class="LineNr">132 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L131" class="LineNr">131 </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#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>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="L132" class="LineNr">132 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L133" class="LineNr">133 </span>    <span class="SalientComment">//// phdr</span>
 <span id="L134" class="LineNr">134 </span>    <span class="Comment">// p_type</span>
 <span id="L135" class="LineNr">135 </span>    <span class="Normal">uint32_t</span> p_type = <span class="Constant">0x1</span><span class="Delimiter">;</span>
@@ -197,12 +198,12 @@ if ('onhashchange' in window) {
 <span id="L137" class="LineNr">137 </span>    <span class="Comment">// p_offset</span>
 <span id="L138" class="LineNr">138 </span>    emit<span class="Delimiter">(</span>p_offset<span class="Delimiter">);</span>
 <span id="L139" class="LineNr">139 </span>    <span class="Comment">// p_vaddr</span>
-<span id="L140" class="LineNr">140 </span>    <span class="Normal">uint32_t</span> p_start = p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>start<span class="Delimiter">;</span>
+<span id="L140" class="LineNr">140 </span>    <span class="Normal">uint32_t</span> p_start = p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>start<span class="Delimiter">;</span>
 <span id="L141" class="LineNr">141 </span>    emit<span class="Delimiter">(</span>p_start<span class="Delimiter">);</span>
 <span id="L142" class="LineNr">142 </span>    <span class="Comment">// p_paddr</span>
 <span id="L143" class="LineNr">143 </span>    emit<span class="Delimiter">(</span>p_start<span class="Delimiter">);</span>
 <span id="L144" class="LineNr">144 </span>    <span class="Comment">// p_filesz</span>
-<span id="L145" class="LineNr">145 </span>    <span class="Normal">uint32_t</span> size = <a href='028translate.cc.html#L189'>num_words</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L145" class="LineNr">145 </span>    <span class="Normal">uint32_t</span> size = <a href='028translate.cc.html#L189'>num_words</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
 <span id="L146" class="LineNr">146 </span>    assert<span class="Delimiter">(</span>p_offset + size &lt; <a href='010---vm.cc.html#L115'>SEGMENT_ALIGNMENT</a><span class="Delimiter">);</span>
 <span id="L147" class="LineNr">147 </span>    emit<span class="Delimiter">(</span>size<span class="Delimiter">);</span>
 <span id="L148" class="LineNr">148 </span>    <span class="Comment">// p_memsz</span>
@@ -225,22 +226,22 @@ if ('onhashchange' in window) {
 <span id="L165" class="LineNr">165 </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="L166" class="LineNr">166 </span>    emit<span class="Delimiter">(</span>p_align<span class="Delimiter">);</span>
 <span id="L167" class="LineNr">167 </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="L168" class="LineNr">168 </span>      <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;segment starting at 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>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; end<span class="Delimiter">();</span>
+<span id="L168" class="LineNr">168 </span>      <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;segment starting at 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>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; end<span class="Delimiter">();</span>
 <span id="L169" class="LineNr">169 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L170" class="LineNr">170 </span>    <span class="Delimiter">}</span>
 <span id="L171" class="LineNr">171 </span>
 <span id="L172" class="LineNr">172 </span>    <span class="Comment">// prepare for next segment</span>
 <span id="L173" class="LineNr">173 </span>    p_offset += size<span class="Delimiter">;</span>
 <span id="L174" class="LineNr">174 </span>  <span class="Delimiter">}</span>
-<span id="L175" class="LineNr">175 </span><span class="Comment">#undef O</span>
-<span id="L176" class="LineNr">176 </span><span class="Comment">#undef emit</span>
+<span id="L175" class="LineNr">175 </span><span class="PreProc">#undef </span><span class="Special">O</span>
+<span id="L176" class="LineNr">176 </span><span class="PreProc">#undef emit</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="Normal">void</span> <a href='028translate.cc.html#L179'>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="L180" class="LineNr">180 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L181" class="LineNr">181 </span>    <span class="Normal">const</span> vector&lt;word&gt;&amp; w = s<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">;</span>
+<span id="L180" class="LineNr">180 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L181" class="LineNr">181 </span>    <span class="Normal">const</span> vector&lt;word&gt;&amp; w = s<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">;</span>
 <span id="L182" class="LineNr">182 </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#L166'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L183" class="LineNr">183 </span>      <span class="Normal">uint8_t</span> x = <a href='011run.cc.html#L266'>hex_byte</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">).</span>data<span class="Delimiter">);</span>  <span class="Comment">// we're done with metadata by this point</span>
+<span id="L183" class="LineNr">183 </span>      <span class="Normal">uint8_t</span> x = <a href='011run.cc.html#L277'>hex_byte</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">).</span>data<span class="Delimiter">);</span>  <span class="Comment">// we're done with metadata by this point</span>
 <span id="L184" class="LineNr">184 </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="L185" class="LineNr">185 </span>    <span class="Delimiter">}</span>
 <span id="L186" class="LineNr">186 </span>  <span class="Delimiter">}</span>
@@ -248,8 +249,8 @@ if ('onhashchange' in window) {
 <span id="L188" class="LineNr">188 </span>
 <span id="L189" class="LineNr">189 </span><span class="Normal">uint32_t</span> <a href='028translate.cc.html#L189'>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="L190" class="LineNr">190 </span>  <span class="Normal">uint32_t</span> sum = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L191" class="LineNr">191 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L192" class="LineNr">192 </span>    sum += <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">);</span>
+<span id="L191" class="LineNr">191 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L192" class="LineNr">192 </span>    sum += <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">);</span>
 <span id="L193" class="LineNr">193 </span>  <span class="Identifier">return</span> sum<span class="Delimiter">;</span>
 <span id="L194" class="LineNr">194 </span><span class="Delimiter">}</span>
 <span id="L195" class="LineNr">195 </span>
diff --git a/html/subx/030---operands.cc.html b/html/subx/030---operands.cc.html
index d1699356..3936f5eb 100644
--- a/html/subx/030---operands.cc.html
+++ b/html/subx/030---operands.cc.html
@@ -14,15 +14,14 @@ pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-
 body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
-.Identifier { color: #af5f00; }
 .LineNr { }
 .Constant { color: #008787; }
 .Delimiter { color: #c000c0; }
 .Special { color: #d70000; }
-.SalientComment { color: #0000af; }
+.Identifier { color: #af5f00; }
 .Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 .Comment { color: #005faf; }
-.traceContains { color: #005f00; }
+.SalientComment { color: #0000af; }
 -->
 </style>
 
@@ -79,440 +78,476 @@ if ('onhashchange' in window) {
 <span id="L19" class="LineNr"> 19 </span>  <span class="Constant">&quot;Each operand has a type. An instruction won't have more than one operand of\n&quot;</span>
 <span id="L20" class="LineNr"> 20 </span>  <span class="Constant">&quot;any type.\n&quot;</span>
 <span id="L21" class="LineNr"> 21 </span>  <span class="Constant">&quot;Each instruction has some set of allowed operand types. It'll reject others.\n&quot;</span>
-<span id="L22" class="LineNr"> 22 </span>  <span class="Constant">&quot;The complete list of operand <a href='031check_operands.cc.html#L455'>types</a>: mod, subop, r32 (register), rm32\n&quot;</span>
-<span id="L23" class="LineNr"> 23 </span>  <span class="Constant">&quot;(register or memory), scale, index, base, disp8, disp16, disp32, imm8,\n&quot;</span>
+<span id="L22" class="LineNr"> 22 </span>  <span class="Constant">&quot;The complete list of operand types: mod, subop, r32 (register), rm32\n&quot;</span>
+<span id="L23" class="LineNr"> 23 </span>  <span class="Constant">&quot;(register or memory), scale, index, base, disp8, disp16, <a href='040---tests.cc.html#L83'>disp32</a>, imm8,\n&quot;</span>
 <span id="L24" class="LineNr"> 24 </span>  <span class="Constant">&quot;imm32.\n&quot;</span>
 <span id="L25" class="LineNr"> 25 </span>  <span class="Constant">&quot;Each of these has its own help page. Try reading 'subx help mod' next.\n&quot;</span>
 <span id="L26" class="LineNr"> 26 </span><span class="Delimiter">);</span>
 <span id="L27" class="LineNr"> 27 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Contents&quot;)</span>
 <span id="L28" class="LineNr"> 28 </span>cerr &lt;&lt; <span class="Constant">&quot;  instructions\n&quot;</span><span class="Delimiter">;</span>
 <span id="L29" class="LineNr"> 29 </span>
-<span id="L30" class="LineNr"> 30 </span><span class="Delimiter">:(scenario pack_immediate_constants)</span>
-<span id="L31" class="LineNr"> 31 </span>== <span class="Constant">0x1</span>
-<span id="L32" class="LineNr"> 32 </span>bb  <span class="Constant">0x2a</span>/imm32
-<span id="L33" class="LineNr"> 33 </span><span class="traceContains">+transform: packing instruction 'bb 0x2a/imm32'</span>
-<span id="L34" class="LineNr"> 34 </span><span class="traceContains">+transform: instruction after packing: 'bb 2a 00 00 00'</span>
-<span id="L35" class="LineNr"> 35 </span><span class="traceContains">+run: copy <a href='037heap.cc.html#L23'>imm32</a> 0x0000002a to <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L36" class="LineNr"> 36 </span>
-<span id="L37" class="LineNr"> 37 </span><span class="Comment">//: complete set of valid operand types</span>
-<span id="L38" class="LineNr"> 38 </span>
-<span id="L39" class="LineNr"> 39 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L40" class="LineNr"> 40 </span>set&lt;string&gt; <span class="Special"><a href='030---operands.cc.html#L40'>Instruction_operands</a></span><span class="Delimiter">;</span>
-<span id="L41" class="LineNr"> 41 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
-<span id="L42" class="LineNr"> 42 </span><span class="Special"><a href='030---operands.cc.html#L40'>Instruction_operands</a></span><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;subop&quot;</span><span class="Delimiter">);</span>
-<span id="L43" class="LineNr"> 43 </span><span class="Special"><a href='030---operands.cc.html#L40'>Instruction_operands</a></span><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;mod&quot;</span><span class="Delimiter">);</span>
-<span id="L44" class="LineNr"> 44 </span><span class="Special"><a href='030---operands.cc.html#L40'>Instruction_operands</a></span><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">);</span>
-<span id="L45" class="LineNr"> 45 </span><span class="Special"><a href='030---operands.cc.html#L40'>Instruction_operands</a></span><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;base&quot;</span><span class="Delimiter">);</span>
-<span id="L46" class="LineNr"> 46 </span><span class="Special"><a href='030---operands.cc.html#L40'>Instruction_operands</a></span><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;index&quot;</span><span class="Delimiter">);</span>
-<span id="L47" class="LineNr"> 47 </span><span class="Special"><a href='030---operands.cc.html#L40'>Instruction_operands</a></span><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;scale&quot;</span><span class="Delimiter">);</span>
-<span id="L48" class="LineNr"> 48 </span><span class="Special"><a href='030---operands.cc.html#L40'>Instruction_operands</a></span><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;r32&quot;</span><span class="Delimiter">);</span>
-<span id="L49" class="LineNr"> 49 </span><span class="Special"><a href='030---operands.cc.html#L40'>Instruction_operands</a></span><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">);</span>
-<span id="L50" class="LineNr"> 50 </span><span class="Special"><a href='030---operands.cc.html#L40'>Instruction_operands</a></span><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">);</span>
-<span id="L51" class="LineNr"> 51 </span><span class="Special"><a href='030---operands.cc.html#L40'>Instruction_operands</a></span><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">);</span>
-<span id="L52" class="LineNr"> 52 </span><span class="Special"><a href='030---operands.cc.html#L40'>Instruction_operands</a></span><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;imm8&quot;</span><span class="Delimiter">);</span>
-<span id="L53" class="LineNr"> 53 </span><span class="Special"><a href='030---operands.cc.html#L40'>Instruction_operands</a></span><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">);</span>
-<span id="L54" class="LineNr"> 54 </span>
-<span id="L55" class="LineNr"> 55 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Texts&quot;)</span>
-<span id="L56" class="LineNr"> 56 </span><a href='030---operands.cc.html#L58'>init_operand_type_help</a><span class="Delimiter">();</span>
-<span id="L57" class="LineNr"> 57 </span><span class="Delimiter">:(code)</span>
-<span id="L58" class="LineNr"> 58 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L58'>init_operand_type_help</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L59" class="LineNr"> 59 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">,</span>
-<span id="L60" class="LineNr"> 60 </span>    <span class="Constant">&quot;2-bit operand controlling the _addressing mode_ of many instructions,\n&quot;</span>
-<span id="L61" class="LineNr"> 61 </span>    <span class="Constant">&quot;to determine how to compute the _effective address_ to look up memory at\n&quot;</span>
-<span id="L62" class="LineNr"> 62 </span>    <span class="Constant">&quot;based on the 'rm32' operand and potentially others.\n&quot;</span>
-<span id="L63" class="LineNr"> 63 </span>    <span class="Constant">&quot;\n&quot;</span>
-<span id="L64" class="LineNr"> 64 </span>    <span class="Constant">&quot;If mod = 3, just operate on the <a href='003trace.cc.html#L131'>contents</a> of the register specified by rm32\n&quot;</span>
-<span id="L65" class="LineNr"> 65 </span>    <span class="Constant">&quot;            (direct mode).\n&quot;</span>
-<span id="L66" class="LineNr"> 66 </span>    <span class="Constant">&quot;If mod = 2, effective address is usually* rm32 + disp32\n&quot;</span>
-<span id="L67" class="LineNr"> 67 </span>    <span class="Constant">&quot;            (indirect mode with displacement).\n&quot;</span>
-<span id="L68" class="LineNr"> 68 </span>    <span class="Constant">&quot;If mod = 1, effective address is usually* rm32 + disp8\n&quot;</span>
-<span id="L69" class="LineNr"> 69 </span>    <span class="Constant">&quot;            (indirect mode with displacement).\n&quot;</span>
-<span id="L70" class="LineNr"> 70 </span>    <span class="Constant">&quot;If mod = 0, effective address is usually* rm32 (indirect mode).\n&quot;</span>
-<span id="L71" class="LineNr"> 71 </span>    <span class="Constant">&quot;(* - The exception is when rm32 is '4'. Register 4 is the stack pointer (ESP).\n&quot;</span>
-<span id="L72" class="LineNr"> 72 </span>    <span class="Constant">&quot;     Using it as an address gets more involved. For more details,\n&quot;</span>
-<span id="L73" class="LineNr"> 73 </span>    <span class="Constant">&quot;     try reading the help pages for 'base', 'index' and 'scale'.)\n&quot;</span>
-<span id="L74" class="LineNr"> 74 </span>    <span class="Constant">&quot;\n&quot;</span>
-<span id="L75" class="LineNr"> 75 </span>    <span class="Constant">&quot;For complete details, spend some time with two tables in the IA-32 software\n&quot;</span>
-<span id="L76" class="LineNr"> 76 </span>    <span class="Constant">&quot;developer's manual that are also included in this repo:\n&quot;</span>
-<span id="L77" class="LineNr"> 77 </span>    <span class="Constant">&quot;  - modrm.pdf: volume 2, table 2-2, \&quot;</span><span class="Constant">32</span>-bit addressing with the ModR/<span class="Special">M</span> byte<span class="Delimiter">.</span>\<span class="Constant">&quot;.\n&quot;</span>
-<span id="L78" class="LineNr"> 78 </span>    <span class="Constant">&quot;  - sib.pdf: volume 2, table 2-3, \&quot;</span><span class="Constant">32</span>-bit addressing with the SIB byte<span class="Delimiter">.</span>\<span class="Constant">&quot;.\n&quot;</span>
-<span id="L79" class="LineNr"> 79 </span>  <span class="Delimiter">);</span>
-<span id="L80" class="LineNr"> 80 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;subop&quot;</span><span class="Delimiter">,</span>
-<span id="L81" class="LineNr"> 81 </span>    <span class="Constant">&quot;Additional 3-bit operand for determining the instruction when the opcode is 81, 8f or ff.\n&quot;</span>
-<span id="L82" class="LineNr"> 82 </span>    <span class="Constant">&quot;Can't coexist with operand of type 'r32' in a single instruction, because the two use the same bits.\n&quot;</span>
-<span id="L83" class="LineNr"> 83 </span>  <span class="Delimiter">);</span>
-<span id="L84" class="LineNr"> 84 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;r32&quot;</span><span class="Delimiter">,</span>
-<span id="L85" class="LineNr"> 85 </span>    <span class="Constant">&quot;3-bit operand specifying a register operand used directly, without any further addressing modes.\n&quot;</span>
-<span id="L86" class="LineNr"> 86 </span>  <span class="Delimiter">);</span>
-<span id="L87" class="LineNr"> 87 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">,</span>
-<span id="L88" class="LineNr"> 88 </span>    <span class="Constant">&quot;32-bit value in register or memory. The precise details of its construction\n&quot;</span>
-<span id="L89" class="LineNr"> 89 </span>    <span class="Constant">&quot;depend on the eponymous 3-bit 'rm32' operand, the 'mod' operand, and also\n&quot;</span>
-<span id="L90" class="LineNr"> 90 </span>    <span class="Constant">&quot;potentially the 'SIB' operands ('scale', 'index' and 'base') and a displacement\n&quot;</span>
-<span id="L91" class="LineNr"> 91 </span>    <span class="Constant">&quot;('disp8' or 'disp32').\n&quot;</span>
-<span id="L92" class="LineNr"> 92 </span>    <span class="Constant">&quot;\n&quot;</span>
-<span id="L93" class="LineNr"> 93 </span>    <span class="Constant">&quot;For complete details, spend some time with two tables in the IA-32 software\n&quot;</span>
-<span id="L94" class="LineNr"> 94 </span>    <span class="Constant">&quot;developer's manual that are also included in this repo:\n&quot;</span>
-<span id="L95" class="LineNr"> 95 </span>    <span class="Constant">&quot;  - modrm.pdf: volume 2, table 2-2, \&quot;</span><span class="Constant">32</span>-bit addressing with the ModR/<span class="Special">M</span> byte<span class="Delimiter">.</span>\<span class="Constant">&quot;.\n&quot;</span>
-<span id="L96" class="LineNr"> 96 </span>    <span class="Constant">&quot;  - sib.pdf: volume 2, table 2-3, \&quot;</span><span class="Constant">32</span>-bit addressing with the SIB byte<span class="Delimiter">.</span>\<span class="Constant">&quot;.\n&quot;</span>
-<span id="L97" class="LineNr"> 97 </span>  <span class="Delimiter">);</span>
-<span id="L98" class="LineNr"> 98 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span>
-<span id="L99" class="LineNr"> 99 </span>    <span class="Constant">&quot;Additional 3-bit operand (when 'rm32' is 4, unless 'mod' is 3) specifying the\n&quot;</span>
-<span id="L100" class="LineNr">100 </span>    <span class="Constant">&quot;register containing an address to look up.\n&quot;</span>
-<span id="L101" class="LineNr">101 </span>    <span class="Constant">&quot;This address may be further modified by 'index' and 'scale' operands.\n&quot;</span>
-<span id="L102" class="LineNr">102 </span>    <span class="Constant">&quot;  effective address = base + index*scale + displacement (disp8 or disp32)\n&quot;</span>
-<span id="L103" class="LineNr">103 </span>    <span class="Constant">&quot;For complete details, spend some time with the IA-32 software developer's manual,\n&quot;</span>
-<span id="L104" class="LineNr">104 </span>    <span class="Constant">&quot;volume 2, table 2-3, \&quot;</span><span class="Constant">32</span>-bit addressing with the SIB byte\<span class="Constant">&quot;.\n&quot;</span>
-<span id="L105" class="LineNr">105 </span>    <span class="Constant">&quot;It is included in this repository as 'sib.pdf'.\n&quot;</span>
-<span id="L106" class="LineNr">106 </span>  <span class="Delimiter">);</span>
-<span id="L107" class="LineNr">107 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span>
-<span id="L108" class="LineNr">108 </span>    <span class="Constant">&quot;Optional 3-bit operand (when 'rm32' is 4 unless 'mod' is 3) that can be added to\n&quot;</span>
-<span id="L109" class="LineNr">109 </span>    <span class="Constant">&quot;the 'base' operand to compute the 'effective address' at which to look up memory.\n&quot;</span>
-<span id="L110" class="LineNr">110 </span>    <span class="Constant">&quot;  effective address = base + index*scale + displacement (disp8 or disp32)\n&quot;</span>
-<span id="L111" class="LineNr">111 </span>    <span class="Constant">&quot;For complete details, spend some time with the IA-32 software developer's manual,\n&quot;</span>
-<span id="L112" class="LineNr">112 </span>    <span class="Constant">&quot;volume 2, table 2-3, \&quot;</span><span class="Constant">32</span>-bit addressing with the SIB byte\<span class="Constant">&quot;.\n&quot;</span>
-<span id="L113" class="LineNr">113 </span>    <span class="Constant">&quot;It is included in this repository as 'sib.pdf'.\n&quot;</span>
-<span id="L114" class="LineNr">114 </span>  <span class="Delimiter">);</span>
-<span id="L115" class="LineNr">115 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;scale&quot;</span><span class="Delimiter">,</span>
-<span id="L116" class="LineNr">116 </span>    <span class="Constant">&quot;Optional 2-bit operand (when 'rm32' is 4 unless 'mod' is 3) that encodes a\n&quot;</span>
-<span id="L117" class="LineNr">117 </span>    <span class="Constant">&quot;power of 2 to be multiplied to the 'index' operand before adding the result to\n&quot;</span>
-<span id="L118" class="LineNr">118 </span>    <span class="Constant">&quot;the 'base' operand to compute the _effective address_ to operate on.\n&quot;</span>
-<span id="L119" class="LineNr">119 </span>    <span class="Constant">&quot;  effective address = base + index * scale + displacement (disp8 or disp32)\n&quot;</span>
-<span id="L120" class="LineNr">120 </span>    <span class="Constant">&quot;\n&quot;</span>
-<span id="L121" class="LineNr">121 </span>    <span class="Constant">&quot;When scale is 0, use index unmodified.\n&quot;</span>
-<span id="L122" class="LineNr">122 </span>    <span class="Constant">&quot;When scale is 1, multiply index by 2.\n&quot;</span>
-<span id="L123" class="LineNr">123 </span>    <span class="Constant">&quot;When scale is 2, multiply index by 4.\n&quot;</span>
-<span id="L124" class="LineNr">124 </span>    <span class="Constant">&quot;When scale is 3, multiply index by 8.\n&quot;</span>
-<span id="L125" class="LineNr">125 </span>    <span class="Constant">&quot;\n&quot;</span>
-<span id="L126" class="LineNr">126 </span>    <span class="Constant">&quot;For complete details, spend some time with the IA-32 software developer's manual,\n&quot;</span>
-<span id="L127" class="LineNr">127 </span>    <span class="Constant">&quot;volume 2, table 2-3, \&quot;</span><span class="Constant">32</span>-bit addressing with the SIB byte\<span class="Constant">&quot;.\n&quot;</span>
-<span id="L128" class="LineNr">128 </span>    <span class="Constant">&quot;It is included in this repository as 'sib.pdf'.\n&quot;</span>
-<span id="L129" class="LineNr">129 </span>  <span class="Delimiter">);</span>
-<span id="L130" class="LineNr">130 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">,</span>
-<span id="L131" class="LineNr">131 </span>    <span class="Constant">&quot;8-bit value to be added in many instructions.\n&quot;</span>
-<span id="L132" class="LineNr">132 </span>  <span class="Delimiter">);</span>
-<span id="L133" class="LineNr">133 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">,</span>
-<span id="L134" class="LineNr">134 </span>    <span class="Constant">&quot;16-bit value to be added in many instructions.\n&quot;</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='030---operands.cc.html#L31'>test_pack_immediate_constants</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L32" class="LineNr"> 32 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L33" class="LineNr"> 33 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L34" class="LineNr"> 34 </span>      <span class="Constant">&quot;bb  0x2a/imm32\n&quot;</span>
+<span id="L35" class="LineNr"> 35 </span>  <span class="Delimiter">);</span>
+<span id="L36" class="LineNr"> 36 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L37" class="LineNr"> 37 </span>      <span class="Constant">&quot;transform: packing instruction 'bb 0x2a/imm32'\n&quot;</span>
+<span id="L38" class="LineNr"> 38 </span>      <span class="Constant">&quot;transform: instruction after packing: 'bb 2a 00 00 00'\n&quot;</span>
+<span id="L39" class="LineNr"> 39 </span>      <span class="Constant">&quot;run: copy <a href='037heap.cc.html#L23'>imm32</a> 0x0000002a to EBX\n&quot;</span>
+<span id="L40" class="LineNr"> 40 </span>  <span class="Delimiter">);</span>
+<span id="L41" class="LineNr"> 41 </span><span class="Delimiter">}</span>
+<span id="L42" class="LineNr"> 42 </span>
+<span id="L43" class="LineNr"> 43 </span><span class="Comment">//: complete set of valid operand types</span>
+<span id="L44" class="LineNr"> 44 </span>
+<span id="L45" class="LineNr"> 45 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L46" class="LineNr"> 46 </span>set&lt;string&gt; <span class="Special"><a href='030---operands.cc.html#L46'>Instruction_operands</a></span><span class="Delimiter">;</span>
+<span id="L47" class="LineNr"> 47 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
+<span id="L48" class="LineNr"> 48 </span><span class="Special"><a href='030---operands.cc.html#L46'>Instruction_operands</a></span><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;subop&quot;</span><span class="Delimiter">);</span>
+<span id="L49" class="LineNr"> 49 </span><span class="Special"><a href='030---operands.cc.html#L46'>Instruction_operands</a></span><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;mod&quot;</span><span class="Delimiter">);</span>
+<span id="L50" class="LineNr"> 50 </span><span class="Special"><a href='030---operands.cc.html#L46'>Instruction_operands</a></span><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">);</span>
+<span id="L51" class="LineNr"> 51 </span><span class="Special"><a href='030---operands.cc.html#L46'>Instruction_operands</a></span><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;base&quot;</span><span class="Delimiter">);</span>
+<span id="L52" class="LineNr"> 52 </span><span class="Special"><a href='030---operands.cc.html#L46'>Instruction_operands</a></span><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;index&quot;</span><span class="Delimiter">);</span>
+<span id="L53" class="LineNr"> 53 </span><span class="Special"><a href='030---operands.cc.html#L46'>Instruction_operands</a></span><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;scale&quot;</span><span class="Delimiter">);</span>
+<span id="L54" class="LineNr"> 54 </span><span class="Special"><a href='030---operands.cc.html#L46'>Instruction_operands</a></span><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;r32&quot;</span><span class="Delimiter">);</span>
+<span id="L55" class="LineNr"> 55 </span><span class="Special"><a href='030---operands.cc.html#L46'>Instruction_operands</a></span><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">);</span>
+<span id="L56" class="LineNr"> 56 </span><span class="Special"><a href='030---operands.cc.html#L46'>Instruction_operands</a></span><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">);</span>
+<span id="L57" class="LineNr"> 57 </span><span class="Special"><a href='030---operands.cc.html#L46'>Instruction_operands</a></span><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">);</span>
+<span id="L58" class="LineNr"> 58 </span><span class="Special"><a href='030---operands.cc.html#L46'>Instruction_operands</a></span><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;imm8&quot;</span><span class="Delimiter">);</span>
+<span id="L59" class="LineNr"> 59 </span><span class="Special"><a href='030---operands.cc.html#L46'>Instruction_operands</a></span><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">);</span>
+<span id="L60" class="LineNr"> 60 </span>
+<span id="L61" class="LineNr"> 61 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Texts&quot;)</span>
+<span id="L62" class="LineNr"> 62 </span><a href='030---operands.cc.html#L64'>init_operand_type_help</a><span class="Delimiter">();</span>
+<span id="L63" class="LineNr"> 63 </span><span class="Delimiter">:(code)</span>
+<span id="L64" class="LineNr"> 64 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L64'>init_operand_type_help</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L65" class="LineNr"> 65 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">,</span>
+<span id="L66" class="LineNr"> 66 </span>    <span class="Constant">&quot;2-bit operand controlling the _addressing mode_ of many instructions,\n&quot;</span>
+<span id="L67" class="LineNr"> 67 </span>    <span class="Constant">&quot;to determine how to compute the _effective address_ to look up memory at\n&quot;</span>
+<span id="L68" class="LineNr"> 68 </span>    <span class="Constant">&quot;based on the 'rm32' operand and potentially others.\n&quot;</span>
+<span id="L69" class="LineNr"> 69 </span>    <span class="Constant">&quot;\n&quot;</span>
+<span id="L70" class="LineNr"> 70 </span>    <span class="Constant">&quot;If mod = 3, just operate on the <a href='003trace.cc.html#L117'>contents</a> of the register specified by rm32\n&quot;</span>
+<span id="L71" class="LineNr"> 71 </span>    <span class="Constant">&quot;            (direct mode).\n&quot;</span>
+<span id="L72" class="LineNr"> 72 </span>    <span class="Constant">&quot;If mod = 2, effective address is usually* rm32 + disp32\n&quot;</span>
+<span id="L73" class="LineNr"> 73 </span>    <span class="Constant">&quot;            (indirect mode with displacement).\n&quot;</span>
+<span id="L74" class="LineNr"> 74 </span>    <span class="Constant">&quot;If mod = 1, effective address is usually* rm32 + disp8\n&quot;</span>
+<span id="L75" class="LineNr"> 75 </span>    <span class="Constant">&quot;            (indirect mode with displacement).\n&quot;</span>
+<span id="L76" class="LineNr"> 76 </span>    <span class="Constant">&quot;If mod = 0, effective address is usually* rm32 (indirect mode).\n&quot;</span>
+<span id="L77" class="LineNr"> 77 </span>    <span class="Constant">&quot;(* - The exception is when rm32 is '4'. Register 4 is the stack pointer (ESP).\n&quot;</span>
+<span id="L78" class="LineNr"> 78 </span>    <span class="Constant">&quot;     Using it as an address gets more involved. For more details,\n&quot;</span>
+<span id="L79" class="LineNr"> 79 </span>    <span class="Constant">&quot;     try reading the help pages for 'base', 'index' and 'scale'.)\n&quot;</span>
+<span id="L80" class="LineNr"> 80 </span>    <span class="Constant">&quot;\n&quot;</span>
+<span id="L81" class="LineNr"> 81 </span>    <span class="Constant">&quot;For complete details, spend some time with two tables in the IA-32 software\n&quot;</span>
+<span id="L82" class="LineNr"> 82 </span>    <span class="Constant">&quot;developer's manual that are also included in this repo:\n&quot;</span>
+<span id="L83" class="LineNr"> 83 </span>    <span class="Constant">&quot;  - modrm.pdf: volume 2, table 2-2, \&quot;</span><span class="Constant">32</span>-bit addressing with the ModR/<span class="Special">M</span> byte<span class="Delimiter">.</span>\<span class="Constant">&quot;.\n&quot;</span>
+<span id="L84" class="LineNr"> 84 </span>    <span class="Constant">&quot;  - sib.pdf: volume 2, table 2-3, \&quot;</span><span class="Constant">32</span>-bit addressing with the SIB byte<span class="Delimiter">.</span>\<span class="Constant">&quot;.\n&quot;</span>
+<span id="L85" class="LineNr"> 85 </span>  <span class="Delimiter">);</span>
+<span id="L86" class="LineNr"> 86 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;subop&quot;</span><span class="Delimiter">,</span>
+<span id="L87" class="LineNr"> 87 </span>    <span class="Constant">&quot;Additional 3-bit operand for determining the instruction when the opcode is 81, 8f or ff.\n&quot;</span>
+<span id="L88" class="LineNr"> 88 </span>    <span class="Constant">&quot;Can't coexist with operand of type 'r32' in a single instruction, because the two use the same bits.\n&quot;</span>
+<span id="L89" class="LineNr"> 89 </span>  <span class="Delimiter">);</span>
+<span id="L90" class="LineNr"> 90 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;r32&quot;</span><span class="Delimiter">,</span>
+<span id="L91" class="LineNr"> 91 </span>    <span class="Constant">&quot;3-bit operand specifying a register operand used directly, without any further addressing modes.\n&quot;</span>
+<span id="L92" class="LineNr"> 92 </span>  <span class="Delimiter">);</span>
+<span id="L93" class="LineNr"> 93 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">,</span>
+<span id="L94" class="LineNr"> 94 </span>    <span class="Constant">&quot;32-bit value in register or memory. The precise details of its construction\n&quot;</span>
+<span id="L95" class="LineNr"> 95 </span>    <span class="Constant">&quot;depend on the eponymous 3-bit 'rm32' operand, the 'mod' operand, and also\n&quot;</span>
+<span id="L96" class="LineNr"> 96 </span>    <span class="Constant">&quot;potentially the 'SIB' operands ('scale', 'index' and 'base') and a displacement\n&quot;</span>
+<span id="L97" class="LineNr"> 97 </span>    <span class="Constant">&quot;('disp8' or 'disp32').\n&quot;</span>
+<span id="L98" class="LineNr"> 98 </span>    <span class="Constant">&quot;\n&quot;</span>
+<span id="L99" class="LineNr"> 99 </span>    <span class="Constant">&quot;For complete details, spend some time with two tables in the IA-32 software\n&quot;</span>
+<span id="L100" class="LineNr">100 </span>    <span class="Constant">&quot;developer's manual that are also included in this repo:\n&quot;</span>
+<span id="L101" class="LineNr">101 </span>    <span class="Constant">&quot;  - modrm.pdf: volume 2, table 2-2, \&quot;</span><span class="Constant">32</span>-bit addressing with the ModR/<span class="Special">M</span> byte<span class="Delimiter">.</span>\<span class="Constant">&quot;.\n&quot;</span>
+<span id="L102" class="LineNr">102 </span>    <span class="Constant">&quot;  - sib.pdf: volume 2, table 2-3, \&quot;</span><span class="Constant">32</span>-bit addressing with the SIB byte<span class="Delimiter">.</span>\<span class="Constant">&quot;.\n&quot;</span>
+<span id="L103" class="LineNr">103 </span>  <span class="Delimiter">);</span>
+<span id="L104" class="LineNr">104 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span>
+<span id="L105" class="LineNr">105 </span>    <span class="Constant">&quot;Additional 3-bit operand (when 'rm32' is 4, unless 'mod' is 3) specifying the\n&quot;</span>
+<span id="L106" class="LineNr">106 </span>    <span class="Constant">&quot;register containing an address to look up.\n&quot;</span>
+<span id="L107" class="LineNr">107 </span>    <span class="Constant">&quot;This address may be further modified by 'index' and 'scale' operands.\n&quot;</span>
+<span id="L108" class="LineNr">108 </span>    <span class="Constant">&quot;  effective address = base + index*scale + displacement (disp8 or disp32)\n&quot;</span>
+<span id="L109" class="LineNr">109 </span>    <span class="Constant">&quot;For complete details, spend some time with the IA-32 software developer's manual,\n&quot;</span>
+<span id="L110" class="LineNr">110 </span>    <span class="Constant">&quot;volume 2, table 2-3, \&quot;</span><span class="Constant">32</span>-bit addressing with the SIB byte\<span class="Constant">&quot;.\n&quot;</span>
+<span id="L111" class="LineNr">111 </span>    <span class="Constant">&quot;It is included in this repository as 'sib.pdf'.\n&quot;</span>
+<span id="L112" class="LineNr">112 </span>  <span class="Delimiter">);</span>
+<span id="L113" class="LineNr">113 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span>
+<span id="L114" class="LineNr">114 </span>    <span class="Constant">&quot;Optional 3-bit operand (when 'rm32' is 4 unless 'mod' is 3) that can be added to\n&quot;</span>
+<span id="L115" class="LineNr">115 </span>    <span class="Constant">&quot;the 'base' operand to compute the 'effective address' at which to look up memory.\n&quot;</span>
+<span id="L116" class="LineNr">116 </span>    <span class="Constant">&quot;  effective address = base + index*scale + displacement (disp8 or disp32)\n&quot;</span>
+<span id="L117" class="LineNr">117 </span>    <span class="Constant">&quot;For complete details, spend some time with the IA-32 software developer's manual,\n&quot;</span>
+<span id="L118" class="LineNr">118 </span>    <span class="Constant">&quot;volume 2, table 2-3, \&quot;</span><span class="Constant">32</span>-bit addressing with the SIB byte\<span class="Constant">&quot;.\n&quot;</span>
+<span id="L119" class="LineNr">119 </span>    <span class="Constant">&quot;It is included in this repository as 'sib.pdf'.\n&quot;</span>
+<span id="L120" class="LineNr">120 </span>  <span class="Delimiter">);</span>
+<span id="L121" class="LineNr">121 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;scale&quot;</span><span class="Delimiter">,</span>
+<span id="L122" class="LineNr">122 </span>    <span class="Constant">&quot;Optional 2-bit operand (when 'rm32' is 4 unless 'mod' is 3) that encodes a\n&quot;</span>
+<span id="L123" class="LineNr">123 </span>    <span class="Constant">&quot;power of 2 to be multiplied to the 'index' operand before adding the result to\n&quot;</span>
+<span id="L124" class="LineNr">124 </span>    <span class="Constant">&quot;the 'base' operand to compute the _effective address_ to operate on.\n&quot;</span>
+<span id="L125" class="LineNr">125 </span>    <span class="Constant">&quot;  effective address = base + index * scale + displacement (disp8 or disp32)\n&quot;</span>
+<span id="L126" class="LineNr">126 </span>    <span class="Constant">&quot;\n&quot;</span>
+<span id="L127" class="LineNr">127 </span>    <span class="Constant">&quot;When scale is 0, use index unmodified.\n&quot;</span>
+<span id="L128" class="LineNr">128 </span>    <span class="Constant">&quot;When scale is 1, multiply index by 2.\n&quot;</span>
+<span id="L129" class="LineNr">129 </span>    <span class="Constant">&quot;When scale is 2, multiply index by 4.\n&quot;</span>
+<span id="L130" class="LineNr">130 </span>    <span class="Constant">&quot;When scale is 3, multiply index by 8.\n&quot;</span>
+<span id="L131" class="LineNr">131 </span>    <span class="Constant">&quot;\n&quot;</span>
+<span id="L132" class="LineNr">132 </span>    <span class="Constant">&quot;For complete details, spend some time with the IA-32 software developer's manual,\n&quot;</span>
+<span id="L133" class="LineNr">133 </span>    <span class="Constant">&quot;volume 2, table 2-3, \&quot;</span><span class="Constant">32</span>-bit addressing with the SIB byte\<span class="Constant">&quot;.\n&quot;</span>
+<span id="L134" class="LineNr">134 </span>    <span class="Constant">&quot;It is included in this repository as 'sib.pdf'.\n&quot;</span>
 <span id="L135" class="LineNr">135 </span>  <span class="Delimiter">);</span>
-<span id="L136" class="LineNr">136 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">,</span>
-<span id="L137" class="LineNr">137 </span>    <span class="Constant">&quot;32-bit value to be added in many instructions.\n&quot;</span>
+<span id="L136" class="LineNr">136 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">,</span>
+<span id="L137" class="LineNr">137 </span>    <span class="Constant">&quot;8-bit value to be added in many instructions.\n&quot;</span>
 <span id="L138" class="LineNr">138 </span>  <span class="Delimiter">);</span>
-<span id="L139" class="LineNr">139 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;imm8&quot;</span><span class="Delimiter">,</span>
-<span id="L140" class="LineNr">140 </span>    <span class="Constant">&quot;8-bit value for many instructions.\n&quot;</span>
-<span id="L141" class="LineNr">141 </span>  <span class="Delimiter">);</span>
-<span id="L142" class="LineNr">142 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">,</span>
-<span id="L143" class="LineNr">143 </span>    <span class="Constant">&quot;32-bit value for many instructions.\n&quot;</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><span class="SalientComment">//:: transform packing operands into bytes in the right order</span>
-<span id="L148" class="LineNr">148 </span>
-<span id="L149" class="LineNr">149 </span><span class="Delimiter">:(after &quot;Begin Transforms&quot;)</span>
-<span id="L150" class="LineNr">150 </span><span class="Comment">// Begin Level-2 Transforms</span>
-<span id="L151" class="LineNr">151 </span><span class="Special"><a href='011run.cc.html#L224'>Transform</a></span><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pack_operands<span class="Delimiter">);</span>
-<span id="L152" class="LineNr">152 </span><span class="Comment">// End Level-2 Transforms</span>
+<span id="L139" class="LineNr">139 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">,</span>
+<span id="L140" class="LineNr">140 </span>    <span class="Constant">&quot;16-bit value to be added in many instructions.\n&quot;</span>
+<span id="L141" class="LineNr">141 </span>    <span class="Constant">&quot;Currently not used in any SubX instructions.\n&quot;</span>
+<span id="L142" class="LineNr">142 </span>  <span class="Delimiter">);</span>
+<span id="L143" class="LineNr">143 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">,</span>
+<span id="L144" class="LineNr">144 </span>    <span class="Constant">&quot;32-bit value to be added in many instructions.\n&quot;</span>
+<span id="L145" class="LineNr">145 </span>  <span class="Delimiter">);</span>
+<span id="L146" class="LineNr">146 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;imm8&quot;</span><span class="Delimiter">,</span>
+<span id="L147" class="LineNr">147 </span>    <span class="Constant">&quot;8-bit value for many instructions.\n&quot;</span>
+<span id="L148" class="LineNr">148 </span>  <span class="Delimiter">);</span>
+<span id="L149" class="LineNr">149 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">,</span>
+<span id="L150" class="LineNr">150 </span>    <span class="Constant">&quot;32-bit value for many instructions.\n&quot;</span>
+<span id="L151" class="LineNr">151 </span>  <span class="Delimiter">);</span>
+<span id="L152" class="LineNr">152 </span><span class="Delimiter">}</span>
 <span id="L153" class="LineNr">153 </span>
-<span id="L154" class="LineNr">154 </span><span class="Delimiter">:(code)</span>
-<span id="L155" class="LineNr">155 </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="L156" class="LineNr">156 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L157" class="LineNr">157 </span>  segment&amp; <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L158" class="LineNr">158 </span>  <span class="Comment">// Pack Operands(segment code)</span>
-<span id="L159" class="LineNr">159 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">3</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; end<span class="Delimiter">();</span>
-<span id="L160" class="LineNr">160 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L161" class="LineNr">161 </span>    line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L162" class="LineNr">162 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L163" class="LineNr">163 </span>    <a href='003trace.cc.html#L98'>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; end<span class="Delimiter">();</span>
-<span id="L164" class="LineNr">164 </span>    pack_operands<span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L165" class="LineNr">165 </span>    <a href='003trace.cc.html#L98'>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 packing: '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">without metadata</span><span class="Comment">*/</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L166" class="LineNr">166 </span>  <span class="Delimiter">}</span>
-<span id="L167" class="LineNr">167 </span><span class="Delimiter">}</span>
-<span id="L168" class="LineNr">168 </span>
-<span id="L169" class="LineNr">169 </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="L170" class="LineNr">170 </span>  <a href='011run.cc.html#L113'>line</a> new_inst<span class="Delimiter">;</span>
-<span id="L171" class="LineNr">171 </span>  <a href='030---operands.cc.html#L179'>add_opcodes</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
-<span id="L172" class="LineNr">172 </span>  <a href='030---operands.cc.html#L189'>add_modrm_byte</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
-<span id="L173" class="LineNr">173 </span>  <a href='030---operands.cc.html#L215'>add_sib_byte</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
-<span id="L174" class="LineNr">174 </span>  <a href='030---operands.cc.html#L237'>add_disp_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
-<span id="L175" class="LineNr">175 </span>  <a href='030---operands.cc.html#L249'>add_imm_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
-<span id="L176" class="LineNr">176 </span>  inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</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="Normal">void</span> <a href='030---operands.cc.html#L179'>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="L180" class="LineNr">180 </span>  out<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
-<span id="L181" class="LineNr">181 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span> || in<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f2&quot;</span> || in<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span>
-<span id="L182" class="LineNr">182 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
-<span id="L183" class="LineNr">183 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f3&quot;</span> &amp;&amp; in<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
-<span id="L184" class="LineNr">184 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">));</span>
-<span id="L185" class="LineNr">185 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f2&quot;</span> &amp;&amp; in<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
-<span id="L186" class="LineNr">186 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">));</span>
-<span id="L187" class="LineNr">187 </span><span class="Delimiter">}</span>
-<span id="L188" class="LineNr">188 </span>
-<span id="L189" class="LineNr">189 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L189'>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="L190" class="LineNr">190 </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="L191" class="LineNr">191 </span>  <span class="Normal">bool</span> emit =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L192" class="LineNr">192 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L193" class="LineNr">193 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L194" class="LineNr">194 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_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="L195" class="LineNr">195 </span>      mod = <a href='011run.cc.html#L266'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L196" class="LineNr">196 </span>      emit =<span class="Constant"> true</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">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_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="L199" class="LineNr">199 </span>      rm32 = <a href='011run.cc.html#L266'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L200" class="LineNr">200 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L201" class="LineNr">201 </span>    <span class="Delimiter">}</span>
-<span id="L202" class="LineNr">202 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_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="L203" class="LineNr">203 </span>      reg_subop = <a href='011run.cc.html#L266'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L204" class="LineNr">204 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L205" class="LineNr">205 </span>    <span class="Delimiter">}</span>
-<span id="L206" class="LineNr">206 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_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="L207" class="LineNr">207 </span>      reg_subop = <a href='011run.cc.html#L266'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L208" class="LineNr">208 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L209" class="LineNr">209 </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">if</span> <span class="Delimiter">(</span>emit<span class="Delimiter">)</span>
-<span id="L212" class="LineNr">212 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='030---operands.cc.html#L279'>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="L213" class="LineNr">213 </span><span class="Delimiter">}</span>
-<span id="L214" class="LineNr">214 </span>
-<span id="L215" class="LineNr">215 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L215'>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="L216" class="LineNr">216 </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="L217" class="LineNr">217 </span>  <span class="Normal">bool</span> emit =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L218" class="LineNr">218 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L219" class="LineNr">219 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L220" class="LineNr">220 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_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="L221" class="LineNr">221 </span>      scale = <a href='011run.cc.html#L266'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L222" class="LineNr">222 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L223" class="LineNr">223 </span>    <span class="Delimiter">}</span>
-<span id="L224" class="LineNr">224 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_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="L225" class="LineNr">225 </span>      index = <a href='011run.cc.html#L266'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L226" class="LineNr">226 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L227" class="LineNr">227 </span>    <span class="Delimiter">}</span>
-<span id="L228" class="LineNr">228 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_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="L229" class="LineNr">229 </span>      base = <a href='011run.cc.html#L266'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L230" class="LineNr">230 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L231" class="LineNr">231 </span>    <span class="Delimiter">}</span>
-<span id="L232" class="LineNr">232 </span>  <span class="Delimiter">}</span>
-<span id="L233" class="LineNr">233 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>emit<span class="Delimiter">)</span>
-<span id="L234" class="LineNr">234 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='030---operands.cc.html#L279'>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="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="Normal">void</span> <a href='030---operands.cc.html#L237'>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="L238" class="LineNr">238 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L239" class="LineNr">239 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L240" class="LineNr">240 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">))</span>
-<span id="L241" class="LineNr">241 </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="L242" class="LineNr">242 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">))</span>
-<span id="L243" class="LineNr">243 </span>      emit_hex_bytes<span class="Delimiter">(</span>out<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span>
-<span id="L244" class="LineNr">244 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">))</span>
-<span id="L245" class="LineNr">245 </span>      emit_hex_bytes<span class="Delimiter">(</span>out<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> <span class="Constant">4</span><span class="Delimiter">);</span>
-<span id="L246" class="LineNr">246 </span>  <span class="Delimiter">}</span>
-<span id="L247" class="LineNr">247 </span><span class="Delimiter">}</span>
-<span id="L248" class="LineNr">248 </span>
-<span id="L249" class="LineNr">249 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L249'>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="L250" class="LineNr">250 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L251" class="LineNr">251 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L252" class="LineNr">252 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm8&quot;</span><span class="Delimiter">))</span>
-<span id="L253" class="LineNr">253 </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="L254" class="LineNr">254 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">))</span>
-<span id="L255" class="LineNr">255 </span>      emit_hex_bytes<span class="Delimiter">(</span>out<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> <span class="Constant">4</span><span class="Delimiter">);</span>
-<span id="L256" class="LineNr">256 </span>  <span class="Delimiter">}</span>
-<span id="L257" class="LineNr">257 </span><span class="Delimiter">}</span>
-<span id="L258" class="LineNr">258 </span>
-<span id="L259" class="LineNr">259 </span><span class="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="L260" class="LineNr">260 </span>  assert<span class="Delimiter">(</span>num &lt;= <span class="Constant">4</span><span class="Delimiter">);</span>
-<span id="L261" class="LineNr">261 </span>  <span class="Normal">bool</span> is_number = <a href='030---operands.cc.html#L439'>looks_like_hex_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L262" class="LineNr">262 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>num == <span class="Constant">1</span> || !is_number<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L263" class="LineNr">263 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>w<span class="Delimiter">);</span>  <span class="Comment">// preserve existing metadata</span>
-<span id="L264" class="LineNr">264 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>is_number<span class="Delimiter">)</span>
-<span id="L265" class="LineNr">265 </span>      out<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = <a href='030---operands.cc.html#L286'>hex_byte_to_string</a><span class="Delimiter">(</span><a href='011run.cc.html#L355'>parse_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>data<span class="Delimiter">));</span>
-<span id="L266" class="LineNr">266 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L267" class="LineNr">267 </span>  <span class="Delimiter">}</span>
-<span id="L268" class="LineNr">268 </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#L355'>parse_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>data<span class="Delimiter">)),</span> num<span class="Delimiter">);</span>
-<span id="L269" class="LineNr">269 </span><span class="Delimiter">}</span>
-<span id="L270" class="LineNr">270 </span>
-<span id="L271" class="LineNr">271 </span><span class="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="L272" class="LineNr">272 </span>  assert<span class="Delimiter">(</span>num &lt;= <span class="Constant">4</span><span class="Delimiter">);</span>
-<span id="L273" class="LineNr">273 </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="L274" class="LineNr">274 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='030---operands.cc.html#L279'>hex_byte_text</a><span class="Delimiter">(</span>val &amp; <span class="Constant">0xff</span><span class="Delimiter">));</span>
-<span id="L275" class="LineNr">275 </span>    val = val &gt;&gt; <span class="Constant">8</span><span class="Delimiter">;</span>
-<span id="L276" class="LineNr">276 </span>  <span class="Delimiter">}</span>
-<span id="L277" class="LineNr">277 </span><span class="Delimiter">}</span>
-<span id="L278" class="LineNr">278 </span>
-<span id="L279" class="LineNr">279 </span><a href='011run.cc.html#L119'>word</a> <a href='030---operands.cc.html#L279'>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="L280" class="LineNr">280 </span>  <a href='011run.cc.html#L119'>word</a> result<span class="Delimiter">;</span>
-<span id="L281" class="LineNr">281 </span>  result<span class="Delimiter">.</span>data = <a href='030---operands.cc.html#L286'>hex_byte_to_string</a><span class="Delimiter">(</span>val<span class="Delimiter">);</span>
-<span id="L282" class="LineNr">282 </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="L283" class="LineNr">283 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L154" class="LineNr">154 </span><span class="SalientComment">//:: transform packing operands into bytes in the right order</span>
+<span id="L155" class="LineNr">155 </span>
+<span id="L156" class="LineNr">156 </span><span class="Delimiter">:(after &quot;Begin Transforms&quot;)</span>
+<span id="L157" class="LineNr">157 </span><span class="Comment">// Begin Level-2 Transforms</span>
+<span id="L158" class="LineNr">158 </span><span class="Special"><a href='011run.cc.html#L235'>Transform</a></span><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pack_operands<span class="Delimiter">);</span>
+<span id="L159" class="LineNr">159 </span><span class="Comment">// End Level-2 Transforms</span>
+<span id="L160" class="LineNr">160 </span>
+<span id="L161" class="LineNr">161 </span><span class="Delimiter">:(code)</span>
+<span id="L162" class="LineNr">162 </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="L163" class="LineNr">163 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L164" class="LineNr">164 </span>  segment&amp; code = p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L165" class="LineNr">165 </span>  <span class="Comment">// Pack Operands(segment code)</span>
+<span id="L166" class="LineNr">166 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">3</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; end<span class="Delimiter">();</span>
+<span id="L167" class="LineNr">167 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>code<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L168" class="LineNr">168 </span>    line&amp; inst = code<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L169" class="LineNr">169 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L416'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L170" class="LineNr">170 </span>    <a href='003trace.cc.html#L96'>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; end<span class="Delimiter">();</span>
+<span id="L171" class="LineNr">171 </span>    pack_operands<span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L172" class="LineNr">172 </span>    <a href='003trace.cc.html#L96'>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 packing: '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">without metadata</span><span class="Comment">*/</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L173" class="LineNr">173 </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> pack_operands<span class="Delimiter">(</span>line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L177" class="LineNr">177 </span>  <a href='011run.cc.html#L120'>line</a> new_inst<span class="Delimiter">;</span>
+<span id="L178" class="LineNr">178 </span>  <a href='030---operands.cc.html#L186'>add_opcodes</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
+<span id="L179" class="LineNr">179 </span>  <a href='030---operands.cc.html#L196'>add_modrm_byte</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
+<span id="L180" class="LineNr">180 </span>  <a href='030---operands.cc.html#L222'>add_sib_byte</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
+<span id="L181" class="LineNr">181 </span>  <a href='030---operands.cc.html#L244'>add_disp_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
+<span id="L182" class="LineNr">182 </span>  <a href='030---operands.cc.html#L256'>add_imm_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
+<span id="L183" class="LineNr">183 </span>  inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</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='030---operands.cc.html#L186'>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="L187" class="LineNr">187 </span>  out<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
+<span id="L188" class="LineNr">188 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span> || in<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f2&quot;</span> || in<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span>
+<span id="L189" class="LineNr">189 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
+<span id="L190" class="LineNr">190 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f3&quot;</span> &amp;&amp; in<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
+<span id="L191" class="LineNr">191 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">));</span>
+<span id="L192" class="LineNr">192 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f2&quot;</span> &amp;&amp; in<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
+<span id="L193" class="LineNr">193 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">));</span>
+<span id="L194" class="LineNr">194 </span><span class="Delimiter">}</span>
+<span id="L195" class="LineNr">195 </span>
+<span id="L196" class="LineNr">196 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L196'>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="L197" class="LineNr">197 </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="L198" class="LineNr">198 </span>  <span class="Normal">bool</span> emit = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L199" class="LineNr">199 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L200" class="LineNr">200 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L201" class="LineNr">201 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_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="L202" class="LineNr">202 </span>      mod = <a href='011run.cc.html#L277'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L203" class="LineNr">203 </span>      emit = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L204" class="LineNr">204 </span>    <span class="Delimiter">}</span>
+<span id="L205" class="LineNr">205 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_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="L206" class="LineNr">206 </span>      rm32 = <a href='011run.cc.html#L277'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L207" class="LineNr">207 </span>      emit = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L208" class="LineNr">208 </span>    <span class="Delimiter">}</span>
+<span id="L209" class="LineNr">209 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_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="L210" class="LineNr">210 </span>      reg_subop = <a href='011run.cc.html#L277'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L211" class="LineNr">211 </span>      emit = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L212" class="LineNr">212 </span>    <span class="Delimiter">}</span>
+<span id="L213" class="LineNr">213 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_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="L214" class="LineNr">214 </span>      reg_subop = <a href='011run.cc.html#L277'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L215" class="LineNr">215 </span>      emit = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L216" class="LineNr">216 </span>    <span class="Delimiter">}</span>
+<span id="L217" class="LineNr">217 </span>  <span class="Delimiter">}</span>
+<span id="L218" class="LineNr">218 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>emit<span class="Delimiter">)</span>
+<span id="L219" class="LineNr">219 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='030---operands.cc.html#L286'>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="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">void</span> <a href='030---operands.cc.html#L222'>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="L223" class="LineNr">223 </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="L224" class="LineNr">224 </span>  <span class="Normal">bool</span> emit = <span class="Constant">false</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#L166'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L121'>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#L121'>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_operand_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="L228" class="LineNr">228 </span>      scale = <a href='011run.cc.html#L277'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L229" class="LineNr">229 </span>      emit = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L230" class="LineNr">230 </span>    <span class="Delimiter">}</span>
+<span id="L231" class="LineNr">231 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_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="L232" class="LineNr">232 </span>      index = <a href='011run.cc.html#L277'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L233" class="LineNr">233 </span>      emit = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L234" class="LineNr">234 </span>    <span class="Delimiter">}</span>
+<span id="L235" class="LineNr">235 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_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="L236" class="LineNr">236 </span>      base = <a href='011run.cc.html#L277'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L237" class="LineNr">237 </span>      emit = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L238" class="LineNr">238 </span>    <span class="Delimiter">}</span>
+<span id="L239" class="LineNr">239 </span>  <span class="Delimiter">}</span>
+<span id="L240" class="LineNr">240 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>emit<span class="Delimiter">)</span>
+<span id="L241" class="LineNr">241 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='030---operands.cc.html#L286'>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="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="Normal">void</span> <a href='030---operands.cc.html#L244'>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="L245" class="LineNr">245 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L246" class="LineNr">246 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L247" class="LineNr">247 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">))</span>
+<span id="L248" class="LineNr">248 </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="L249" class="LineNr">249 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">))</span>
+<span id="L250" class="LineNr">250 </span>      emit_hex_bytes<span class="Delimiter">(</span>out<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span>
+<span id="L251" class="LineNr">251 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">))</span>
+<span id="L252" class="LineNr">252 </span>      emit_hex_bytes<span class="Delimiter">(</span>out<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> <span class="Constant">4</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">}</span>
+<span id="L255" class="LineNr">255 </span>
+<span id="L256" class="LineNr">256 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L256'>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="L257" class="LineNr">257 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L258" class="LineNr">258 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L259" class="LineNr">259 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm8&quot;</span><span class="Delimiter">))</span>
+<span id="L260" class="LineNr">260 </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="L261" class="LineNr">261 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">))</span>
+<span id="L262" class="LineNr">262 </span>      emit_hex_bytes<span class="Delimiter">(</span>out<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> <span class="Constant">4</span><span class="Delimiter">);</span>
+<span id="L263" class="LineNr">263 </span>  <span class="Delimiter">}</span>
+<span id="L264" class="LineNr">264 </span><span class="Delimiter">}</span>
+<span id="L265" class="LineNr">265 </span>
+<span id="L266" class="LineNr">266 </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="L267" class="LineNr">267 </span>  assert<span class="Delimiter">(</span>num &lt;= <span class="Constant">4</span><span class="Delimiter">);</span>
+<span id="L268" class="LineNr">268 </span>  <span class="Normal">bool</span> is_number = <a href='030---operands.cc.html#L476'>looks_like_hex_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L269" class="LineNr">269 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>num == <span class="Constant">1</span> || !is_number<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L270" class="LineNr">270 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>w<span class="Delimiter">);</span>  <span class="Comment">// preserve existing metadata</span>
+<span id="L271" class="LineNr">271 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>is_number<span class="Delimiter">)</span>
+<span id="L272" class="LineNr">272 </span>      out<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = <a href='030---operands.cc.html#L293'>hex_byte_to_string</a><span class="Delimiter">(</span><a href='011run.cc.html#L382'>parse_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>data<span class="Delimiter">));</span>
+<span id="L273" class="LineNr">273 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L274" class="LineNr">274 </span>  <span class="Delimiter">}</span>
+<span id="L275" class="LineNr">275 </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#L382'>parse_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>data<span class="Delimiter">)),</span> num<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">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="L279" class="LineNr">279 </span>  assert<span class="Delimiter">(</span>num &lt;= <span class="Constant">4</span><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; num<span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L281" class="LineNr">281 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='030---operands.cc.html#L286'>hex_byte_text</a><span class="Delimiter">(</span>val &amp; <span class="Constant">0xff</span><span class="Delimiter">));</span>
+<span id="L282" class="LineNr">282 </span>    val = val &gt;&gt; <span class="Constant">8</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="Delimiter">}</span>
 <span id="L285" class="LineNr">285 </span>
-<span id="L286" class="LineNr">286 </span>string <a href='030---operands.cc.html#L286'>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="L287" class="LineNr">287 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L288" class="LineNr">288 </span>  <span class="Comment">// uint8_t prints without padding, but int8_t will expand to 32 bits again</span>
-<span id="L289" class="LineNr">289 </span>  out &lt;&lt; <a href='010---vm.cc.html#L432'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L435'>NUM</a><span class="Delimiter">(</span>val<span class="Delimiter">);</span>
-<span id="L290" class="LineNr">290 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L286" class="LineNr">286 </span><a href='011run.cc.html#L126'>word</a> <a href='030---operands.cc.html#L286'>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="L287" class="LineNr">287 </span>  <a href='011run.cc.html#L126'>word</a> result<span class="Delimiter">;</span>
+<span id="L288" class="LineNr">288 </span>  result<span class="Delimiter">.</span>data = <a href='030---operands.cc.html#L293'>hex_byte_to_string</a><span class="Delimiter">(</span>val<span class="Delimiter">);</span>
+<span id="L289" class="LineNr">289 </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="L290" class="LineNr">290 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L291" class="LineNr">291 </span><span class="Delimiter">}</span>
 <span id="L292" class="LineNr">292 </span>
-<span id="L293" class="LineNr">293 </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="L293" class="LineNr">293 </span>string <a href='030---operands.cc.html#L293'>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="L294" class="LineNr">294 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L295" class="LineNr">295 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L296" class="LineNr">296 </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="L297" class="LineNr">297 </span>    out &lt;&lt; in<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>data<span class="Delimiter">;</span>
-<span id="L298" class="LineNr">298 </span>  <span class="Delimiter">}</span>
-<span id="L299" class="LineNr">299 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L300" class="LineNr">300 </span><span class="Delimiter">}</span>
-<span id="L301" class="LineNr">301 </span>
-<span id="L302" class="LineNr">302 </span><span class="Delimiter">:(before &quot;End Unit Tests&quot;)</span>
-<span id="L303" class="LineNr">303 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L303'>test_preserve_metadata_when_emitting_single_byte</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L304" class="LineNr">304 </span>  <a href='011run.cc.html#L119'>word</a> in<span class="Delimiter">;</span>
-<span id="L305" class="LineNr">305 </span>  in<span class="Delimiter">.</span>data = <span class="Constant">&quot;f0&quot;</span><span class="Delimiter">;</span>
-<span id="L306" class="LineNr">306 </span>  in<span class="Delimiter">.</span>original = <span class="Constant">&quot;f0/foo&quot;</span><span class="Delimiter">;</span>
-<span id="L307" class="LineNr">307 </span>  <a href='011run.cc.html#L113'>line</a> out<span class="Delimiter">;</span>
-<span id="L308" class="LineNr">308 </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="L309" class="LineNr">309 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>out<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data<span class="Delimiter">,</span> <span class="Constant">&quot;f0&quot;</span><span class="Delimiter">);</span>
-<span id="L310" class="LineNr">310 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>out<span class="Delimiter">.</span><a href='011run.cc.html#L114'>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="L311" class="LineNr">311 </span><span class="Delimiter">}</span>
-<span id="L312" class="LineNr">312 </span>
-<span id="L313" class="LineNr">313 </span><span class="Delimiter">:(scenario pack_disp8)</span>
-<span id="L314" class="LineNr">314 </span>== <span class="Constant">0x1</span>
-<span id="L315" class="LineNr">315 </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="L316" class="LineNr">316 </span><span class="traceContains">+transform: packing instruction '74 2/disp8'</span>
-<span id="L317" class="LineNr">317 </span><span class="traceContains">+transform: instruction after packing: '74 02'</span>
-<span id="L318" class="LineNr">318 </span>
-<span id="L319" class="LineNr">319 </span><span class="Delimiter">:(scenarios transform)</span>
-<span id="L320" class="LineNr">320 </span><span class="Delimiter">:(scenario pack_disp8_negative)</span>
-<span id="L321" class="LineNr">321 </span>== <span class="Constant">0x1</span>
-<span id="L322" class="LineNr">322 </span><span class="Comment"># running this will cause an infinite loop</span>
-<span id="L323" class="LineNr">323 </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="L324" class="LineNr">324 </span><span class="traceContains">+transform: packing instruction '74 -1/disp8'</span>
-<span id="L325" class="LineNr">325 </span><span class="traceContains">+transform: instruction after packing: '74 ff'</span>
-<span id="L326" class="LineNr">326 </span><span class="Delimiter">:(scenarios run)</span>
-<span id="L327" class="LineNr">327 </span>
-<span id="L328" class="LineNr">328 </span><span class="Comment">//: helper for scenario</span>
-<span id="L329" class="LineNr">329 </span><span class="Delimiter">:(code)</span>
-<span id="L330" class="LineNr">330 </span><span class="Normal">void</span> <a href='011run.cc.html#L227'>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="L331" class="LineNr">331 </span>  <a href='011run.cc.html#L95'>program</a> p<span class="Delimiter">;</span>
-<span id="L332" class="LineNr">332 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
-<span id="L333" class="LineNr">333 </span>  parse<span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
-<span id="L334" class="LineNr">334 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L230'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L335" class="LineNr">335 </span>  <a href='011run.cc.html#L227'>transform</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
-<span id="L336" class="LineNr">336 </span><span class="Delimiter">}</span>
-<span id="L337" class="LineNr">337 </span>
-<span id="L338" class="LineNr">338 </span><span class="Delimiter">:(scenario pack_modrm_imm32)</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>  <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="L344" class="LineNr">344 </span><span class="traceContains">+transform: packing instruction '81 0/add/subop 3/mod/direct 3/ebx/rm32 1/imm32'</span>
-<span id="L345" class="LineNr">345 </span><span class="traceContains">+transform: instruction after packing: '81 c3 01 00 00 00'</span>
-<span id="L346" class="LineNr">346 </span>
-<span id="L347" class="LineNr">347 </span><span class="Delimiter">:(scenario pack_imm32_large)</span>
-<span id="L348" class="LineNr">348 </span>== <span class="Constant">0x1</span>
-<span id="L349" class="LineNr">349 </span>b9  <span class="Constant">0x080490a7</span>/imm32
-<span id="L350" class="LineNr">350 </span><span class="traceContains">+transform: packing instruction 'b9 0x080490a7/imm32'</span>
-<span id="L351" class="LineNr">351 </span><span class="traceContains">+transform: instruction after packing: 'b9 a7 90 04 08'</span>
+<span id="L295" class="LineNr">295 </span>  <span class="Comment">// uint8_t prints without padding, but int8_t will expand to 32 bits again</span>
+<span id="L296" class="LineNr">296 </span>  out &lt;&lt; <a href='010---vm.cc.html#L439'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L442'>NUM</a><span class="Delimiter">(</span>val<span class="Delimiter">);</span>
+<span id="L297" class="LineNr">297 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L298" class="LineNr">298 </span><span class="Delimiter">}</span>
+<span id="L299" class="LineNr">299 </span>
+<span id="L300" class="LineNr">300 </span>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="L301" class="LineNr">301 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L302" class="LineNr">302 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L303" class="LineNr">303 </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="L304" class="LineNr">304 </span>    out &lt;&lt; in<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>data<span class="Delimiter">;</span>
+<span id="L305" class="LineNr">305 </span>  <span class="Delimiter">}</span>
+<span id="L306" class="LineNr">306 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L307" class="LineNr">307 </span><span class="Delimiter">}</span>
+<span id="L308" class="LineNr">308 </span>
+<span id="L309" class="LineNr">309 </span><span class="Delimiter">:(before &quot;End Unit Tests&quot;)</span>
+<span id="L310" class="LineNr">310 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L310'>test_preserve_metadata_when_emitting_single_byte</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L311" class="LineNr">311 </span>  <a href='011run.cc.html#L126'>word</a> in<span class="Delimiter">;</span>
+<span id="L312" class="LineNr">312 </span>  in<span class="Delimiter">.</span>data = <span class="Constant">&quot;f0&quot;</span><span class="Delimiter">;</span>
+<span id="L313" class="LineNr">313 </span>  in<span class="Delimiter">.</span>original = <span class="Constant">&quot;f0/foo&quot;</span><span class="Delimiter">;</span>
+<span id="L314" class="LineNr">314 </span>  <a href='011run.cc.html#L120'>line</a> out<span class="Delimiter">;</span>
+<span id="L315" class="LineNr">315 </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="L316" class="LineNr">316 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>out<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data<span class="Delimiter">,</span> <span class="Constant">&quot;f0&quot;</span><span class="Delimiter">);</span>
+<span id="L317" class="LineNr">317 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>out<span class="Delimiter">.</span><a href='011run.cc.html#L121'>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="L318" class="LineNr">318 </span><span class="Delimiter">}</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='030---operands.cc.html#L321'>test_pack_disp8</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L322" class="LineNr">322 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L323" class="LineNr">323 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L324" class="LineNr">324 </span>      <span class="Constant">&quot;74 2/disp8\n&quot;</span>  <span class="Comment">// jump 2 bytes away if ZF is set</span>
+<span id="L325" class="LineNr">325 </span>  <span class="Delimiter">);</span>
+<span id="L326" class="LineNr">326 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L327" class="LineNr">327 </span>      <span class="Constant">&quot;transform: packing instruction '74 2/disp8'\n&quot;</span>
+<span id="L328" class="LineNr">328 </span>      <span class="Constant">&quot;transform: instruction after packing: '74 02'\n&quot;</span>
+<span id="L329" class="LineNr">329 </span>  <span class="Delimiter">);</span>
+<span id="L330" class="LineNr">330 </span><span class="Delimiter">}</span>
+<span id="L331" class="LineNr">331 </span>
+<span id="L332" class="LineNr">332 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L332'>test_pack_disp8_negative</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L333" class="LineNr">333 </span>  transform<span class="Delimiter">(</span>
+<span id="L334" class="LineNr">334 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L335" class="LineNr">335 </span>      <span class="Comment">// running this will cause an infinite loop</span>
+<span id="L336" class="LineNr">336 </span>      <span class="Constant">&quot;74 -1/disp8\n&quot;</span>  <span class="Comment">// jump 1 byte before if ZF is set</span>
+<span id="L337" class="LineNr">337 </span>  <span class="Delimiter">);</span>
+<span id="L338" class="LineNr">338 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L339" class="LineNr">339 </span>      <span class="Constant">&quot;transform: packing instruction '74 -1/disp8'\n&quot;</span>
+<span id="L340" class="LineNr">340 </span>      <span class="Constant">&quot;transform: instruction after packing: '74 ff'\n&quot;</span>
+<span id="L341" class="LineNr">341 </span>  <span class="Delimiter">);</span>
+<span id="L342" class="LineNr">342 </span><span class="Delimiter">}</span>
+<span id="L343" class="LineNr">343 </span>
+<span id="L344" class="LineNr">344 </span><span class="Comment">//: helper for scenario</span>
+<span id="L345" class="LineNr">345 </span><span class="Normal">void</span> transform<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L346" class="LineNr">346 </span>  <a href='011run.cc.html#L102'>program</a> p<span class="Delimiter">;</span>
+<span id="L347" class="LineNr">347 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
+<span id="L348" class="LineNr">348 </span>  parse<span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
+<span id="L349" class="LineNr">349 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L238'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L350" class="LineNr">350 </span>  transform<span class="Delimiter">(</span>p<span class="Delimiter">);</span>
+<span id="L351" class="LineNr">351 </span><span class="Delimiter">}</span>
 <span id="L352" class="LineNr">352 </span>
-<span id="L353" class="LineNr">353 </span><span class="Delimiter">:(scenario pack_immediate_constants_hex)</span>
-<span id="L354" class="LineNr">354 </span>== <span class="Constant">0x1</span>
-<span id="L355" class="LineNr">355 </span>b9  <span class="Constant">0x2a</span>/imm32
-<span id="L356" class="LineNr">356 </span><span class="traceContains">+transform: packing instruction 'b9 0x2a/imm32'</span>
-<span id="L357" class="LineNr">357 </span><span class="traceContains">+transform: instruction after packing: 'b9 2a 00 00 00'</span>
-<span id="L358" class="LineNr">358 </span><span class="traceContains">+run: copy <a href='037heap.cc.html#L23'>imm32</a> 0x0000002a to <a href='010---vm.cc.html#L14'>ECX</a></span>
-<span id="L359" class="LineNr">359 </span>
-<span id="L360" class="LineNr">360 </span><span class="Delimiter">:(scenarios transform)</span>
-<span id="L361" class="LineNr">361 </span><span class="Delimiter">:(scenario pack_silently_ignores_non_hex)</span>
-<span id="L362" class="LineNr">362 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L363" class="LineNr">363 </span>== <span class="Constant">0x1</span>
-<span id="L364" class="LineNr">364 </span>b9  foo/imm32
-<span id="L365" class="LineNr">365 </span><span class="traceContains">+transform: packing instruction 'b9 foo/imm32'</span>
-<span id="L366" class="LineNr">366 </span><span class="Comment"># no change (we're just not printing metadata to the trace)</span>
-<span id="L367" class="LineNr">367 </span><span class="traceContains">+transform: instruction after packing: 'b9 foo'</span>
-<span id="L368" class="LineNr">368 </span><span class="Delimiter">:(scenarios run)</span>
-<span id="L369" class="LineNr">369 </span>
-<span id="L370" class="LineNr">370 </span><span class="Delimiter">:(scenario pack_flags_bad_hex)</span>
-<span id="L371" class="LineNr">371 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L372" class="LineNr">372 </span>== <span class="Constant">0x1</span>
-<span id="L373" class="LineNr">373 </span>b9  0xfoo/imm32
-<span id="L374" class="LineNr">374 </span><span class="traceContains">+error: not a number: 0xfoo</span>
-<span id="L375" class="LineNr">375 </span>
-<span id="L376" class="LineNr">376 </span><span class="SalientComment">//:: helpers</span>
+<span id="L353" class="LineNr">353 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L353'>test_pack_modrm_imm32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L354" class="LineNr">354 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L355" class="LineNr">355 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L356" class="LineNr">356 </span>      <span class="Comment">// instruction                     effective address                                                   operand     displacement    immediate\n&quot;</span>
+<span id="L357" class="LineNr">357 </span>      <span class="Comment">// op          subop               mod             rm32          base        index         scale       r32\n&quot;</span>
+<span id="L358" class="LineNr">358 </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\n&quot;</span>
+<span id="L359" class="LineNr">359 </span>      <span class="Constant">&quot;  81          0/add/subop         3/mod/direct    3/ebx/rm32                                                                      1/imm32      \n&quot;</span>  <span class="Comment">// add 1 to EBX</span>
+<span id="L360" class="LineNr">360 </span>  <span class="Delimiter">);</span>
+<span id="L361" class="LineNr">361 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L362" class="LineNr">362 </span>      <span class="Constant">&quot;transform: packing instruction '81 0/add/subop 3/mod/direct 3/ebx/rm32 1/imm32'\n&quot;</span>
+<span id="L363" class="LineNr">363 </span>      <span class="Constant">&quot;transform: instruction after packing: '81 c3 01 00 00 00'\n&quot;</span>
+<span id="L364" class="LineNr">364 </span>  <span class="Delimiter">);</span>
+<span id="L365" class="LineNr">365 </span><span class="Delimiter">}</span>
+<span id="L366" class="LineNr">366 </span>
+<span id="L367" class="LineNr">367 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L367'>test_pack_imm32_large</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L368" class="LineNr">368 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L369" class="LineNr">369 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L370" class="LineNr">370 </span>      <span class="Constant">&quot;b9  0x080490a7/imm32\n&quot;</span>
+<span id="L371" class="LineNr">371 </span>  <span class="Delimiter">);</span>
+<span id="L372" class="LineNr">372 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L373" class="LineNr">373 </span>      <span class="Constant">&quot;transform: packing instruction 'b9 0x080490a7/imm32'\n&quot;</span>
+<span id="L374" class="LineNr">374 </span>      <span class="Constant">&quot;transform: instruction after packing: 'b9 a7 90 04 08'\n&quot;</span>
+<span id="L375" class="LineNr">375 </span>  <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">:(code)</span>
-<span id="L379" class="LineNr">379 </span><span class="Normal">bool</span> <a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L380" class="LineNr">380 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L381" class="LineNr">381 </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#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span>
-<span id="L382" class="LineNr">382 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L383" class="LineNr">383 </span>  <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L384" class="LineNr">384 </span><span class="Delimiter">}</span>
-<span id="L385" class="LineNr">385 </span>
-<span id="L386" class="LineNr">386 </span><span class="Normal">bool</span> <a href='030---operands.cc.html#L386'>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="L387" class="LineNr">387 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L396'>contains_any_operand_metadata</a><span class="Delimiter">(</span>curr<span class="Delimiter">))</span>
-<span id="L388" class="LineNr">388 </span>    <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L389" class="LineNr">389 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span>
-<span id="L390" class="LineNr">390 </span>    <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L391" class="LineNr">391 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<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="L392" class="LineNr">392 </span>    <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L393" class="LineNr">393 </span>  <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L394" class="LineNr">394 </span><span class="Delimiter">}</span>
-<span id="L395" class="LineNr">395 </span>
-<span id="L396" class="LineNr">396 </span><span class="Normal">bool</span> <a href='030---operands.cc.html#L396'>contains_any_operand_metadata</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; <a href='011run.cc.html#L119'>word</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L397" class="LineNr">397 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='011run.cc.html#L119'>word</a><span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L398" class="LineNr">398 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='030---operands.cc.html#L40'>Instruction_operands</a></span><span class="Delimiter">.</span>find<span class="Delimiter">(</span><a href='011run.cc.html#L119'>word</a><span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> != <span class="Special"><a href='030---operands.cc.html#L40'>Instruction_operands</a></span><span class="Delimiter">.</span>end<span class="Delimiter">())</span>
-<span id="L399" class="LineNr">399 </span>      <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L400" class="LineNr">400 </span>  <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L378" class="LineNr">378 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L378'>test_pack_immediate_constants_hex</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L379" class="LineNr">379 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L380" class="LineNr">380 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L381" class="LineNr">381 </span>      <span class="Constant">&quot;b9  0x2a/imm32\n&quot;</span>
+<span id="L382" class="LineNr">382 </span>  <span class="Delimiter">);</span>
+<span id="L383" class="LineNr">383 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L384" class="LineNr">384 </span>      <span class="Constant">&quot;transform: packing instruction 'b9 0x2a/imm32'\n&quot;</span>
+<span id="L385" class="LineNr">385 </span>      <span class="Constant">&quot;transform: instruction after packing: 'b9 2a 00 00 00'\n&quot;</span>
+<span id="L386" class="LineNr">386 </span>      <span class="Constant">&quot;run: copy <a href='037heap.cc.html#L23'>imm32</a> 0x0000002a to ECX\n&quot;</span>
+<span id="L387" class="LineNr">387 </span>  <span class="Delimiter">);</span>
+<span id="L388" class="LineNr">388 </span><span class="Delimiter">}</span>
+<span id="L389" class="LineNr">389 </span>
+<span id="L390" class="LineNr">390 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L390'>test_pack_silently_ignores_non_hex</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L391" class="LineNr">391 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L392" class="LineNr">392 </span>  transform<span class="Delimiter">(</span>
+<span id="L393" class="LineNr">393 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L394" class="LineNr">394 </span>      <span class="Constant">&quot;b9  foo/imm32\n&quot;</span>
+<span id="L395" class="LineNr">395 </span>  <span class="Delimiter">);</span>
+<span id="L396" class="LineNr">396 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L397" class="LineNr">397 </span>      <span class="Constant">&quot;transform: packing instruction 'b9 foo/imm32'\n&quot;</span>
+<span id="L398" class="LineNr">398 </span>      <span class="Comment">// no change (we're just not printing metadata to the trace)</span>
+<span id="L399" class="LineNr">399 </span>      <span class="Constant">&quot;transform: instruction after packing: 'b9 foo'\n&quot;</span>
+<span id="L400" class="LineNr">400 </span>  <span class="Delimiter">);</span>
 <span id="L401" class="LineNr">401 </span><span class="Delimiter">}</span>
 <span id="L402" class="LineNr">402 </span>
-<span id="L403" class="LineNr">403 </span><span class="Normal">bool</span> has_operand_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="L404" class="LineNr">404 </span>  <span class="Normal">bool</span> result =<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#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L406" class="LineNr">406 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>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="L407" class="LineNr">407 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L408" class="LineNr">408 </span>      <a href='003trace.cc.html#L217'>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\n&quot;</span> &lt;&lt; end<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>    result =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L412" class="LineNr">412 </span>  <span class="Delimiter">}</span>
-<span id="L413" class="LineNr">413 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L414" class="LineNr">414 </span><span class="Delimiter">}</span>
+<span id="L403" class="LineNr">403 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L403'>test_pack_flags_bad_hex</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L404" class="LineNr">404 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L405" class="LineNr">405 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L406" class="LineNr">406 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L407" class="LineNr">407 </span>      <span class="Constant">&quot;b9  0xfoo/imm32\n&quot;</span>
+<span id="L408" class="LineNr">408 </span>  <span class="Delimiter">);</span>
+<span id="L409" class="LineNr">409 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L410" class="LineNr">410 </span>      <span class="Constant">&quot;error: not a number: 0xfoo\n&quot;</span>
+<span id="L411" class="LineNr">411 </span>  <span class="Delimiter">);</span>
+<span id="L412" class="LineNr">412 </span><span class="Delimiter">}</span>
+<span id="L413" class="LineNr">413 </span>
+<span id="L414" class="LineNr">414 </span><span class="SalientComment">//:: helpers</span>
 <span id="L415" class="LineNr">415 </span>
-<span id="L416" class="LineNr">416 </span><span class="Normal">bool</span> has_operand_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="L417" class="LineNr">417 </span>  <span class="Normal">bool</span> result =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L418" class="LineNr">418 </span>  <span class="Normal">bool</span> metadata_found =<span class="Constant"> false</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#L166'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L420" class="LineNr">420 </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="L421" class="LineNr">421 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='030---operands.cc.html#L40'>Instruction_operands</a></span><span class="Delimiter">.</span>find<span class="Delimiter">(</span>curr<span class="Delimiter">)</span> == <span class="Special"><a href='030---operands.cc.html#L40'>Instruction_operands</a></span><span class="Delimiter">.</span>end<span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// ignore unrecognized metadata</span>
-<span id="L422" class="LineNr">422 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>metadata_found<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L423" class="LineNr">423 </span>      <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' has conflicting operand types; it should have only one\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L424" class="LineNr">424 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L425" class="LineNr">425 </span>    <span class="Delimiter">}</span>
-<span id="L426" class="LineNr">426 </span>    metadata_found =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L427" class="LineNr">427 </span>    result = <span class="Delimiter">(</span>curr == m<span class="Delimiter">);</span>
-<span id="L428" class="LineNr">428 </span>  <span class="Delimiter">}</span>
-<span id="L429" class="LineNr">429 </span>  <span class="Identifier">return</span> result<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><a href='011run.cc.html#L119'>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="L433" class="LineNr">433 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L434" class="LineNr">434 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> m<span class="Delimiter">))</span>
-<span id="L435" class="LineNr">435 </span>      <span class="Identifier">return</span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L436" class="LineNr">436 </span>  assert<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">);</span>
-<span id="L437" class="LineNr">437 </span><span class="Delimiter">}</span>
-<span id="L438" class="LineNr">438 </span>
-<span id="L439" class="LineNr">439 </span><span class="Normal">bool</span> <a href='030---operands.cc.html#L439'>looks_like_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="L440" class="LineNr">440 </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="L441" class="LineNr">441 </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> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L442" class="LineNr">442 </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 class="Comment">// includes '0x' prefix</span>
-<span id="L443" class="LineNr">443 </span>  <span class="Comment">// End looks_like_hex_int(s) Detectors</span>
-<span id="L444" class="LineNr">444 </span>  <span class="Identifier">return</span><span class="Constant"> false</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="Delimiter">:(code)</span>
-<span id="L448" class="LineNr">448 </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="L449" class="LineNr">449 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L450" class="LineNr">450 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L451" class="LineNr">451 </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="L452" class="LineNr">452 </span>    out &lt;&lt; inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original<span class="Delimiter">;</span>
-<span id="L453" class="LineNr">453 </span>  <span class="Delimiter">}</span>
-<span id="L454" class="LineNr">454 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L455" class="LineNr">455 </span><span class="Delimiter">}</span>
+<span id="L416" class="LineNr">416 </span><span class="Normal">bool</span> <a href='030---operands.cc.html#L416'>all_hex_bytes</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L417" class="LineNr">417 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L418" class="LineNr">418 </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#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span>
+<span id="L419" class="LineNr">419 </span>      <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L420" class="LineNr">420 </span>  <span class="Identifier">return</span> <span class="Constant">true</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="Normal">bool</span> <a href='030---operands.cc.html#L423'>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="L424" class="LineNr">424 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L433'>contains_any_operand_metadata</a><span class="Delimiter">(</span>curr<span class="Delimiter">))</span>
+<span id="L425" class="LineNr">425 </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">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span>
+<span id="L427" class="LineNr">427 </span>    <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L428" class="LineNr">428 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<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="L429" class="LineNr">429 </span>    <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L430" class="LineNr">430 </span>  <span class="Identifier">return</span> <span class="Constant">true</span><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="Normal">bool</span> <a href='030---operands.cc.html#L433'>contains_any_operand_metadata</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; <a href='011run.cc.html#L126'>word</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L434" class="LineNr">434 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='011run.cc.html#L126'>word</a><span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L435" class="LineNr">435 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='030---operands.cc.html#L46'>Instruction_operands</a></span><span class="Delimiter">.</span>find<span class="Delimiter">(</span><a href='011run.cc.html#L126'>word</a><span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> != <span class="Special"><a href='030---operands.cc.html#L46'>Instruction_operands</a></span><span class="Delimiter">.</span>end<span class="Delimiter">())</span>
+<span id="L436" class="LineNr">436 </span>      <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L437" class="LineNr">437 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L438" class="LineNr">438 </span><span class="Delimiter">}</span>
+<span id="L439" class="LineNr">439 </span>
+<span id="L440" class="LineNr">440 </span><span class="Normal">bool</span> has_operand_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="L441" class="LineNr">441 </span>  <span class="Normal">bool</span> result = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L442" class="LineNr">442 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L443" class="LineNr">443 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>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="L444" class="LineNr">444 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L445" class="LineNr">445 </span>      <a href='003trace.cc.html#L202'>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\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L446" class="LineNr">446 </span>      <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L447" class="LineNr">447 </span>    <span class="Delimiter">}</span>
+<span id="L448" class="LineNr">448 </span>    result = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L449" class="LineNr">449 </span>  <span class="Delimiter">}</span>
+<span id="L450" class="LineNr">450 </span>  <span class="Identifier">return</span> result<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">bool</span> has_operand_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="L454" class="LineNr">454 </span>  <span class="Normal">bool</span> result = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L455" class="LineNr">455 </span>  <span class="Normal">bool</span> metadata_found = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L456" class="LineNr">456 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L457" class="LineNr">457 </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="L458" class="LineNr">458 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='030---operands.cc.html#L46'>Instruction_operands</a></span><span class="Delimiter">.</span>find<span class="Delimiter">(</span>curr<span class="Delimiter">)</span> == <span class="Special"><a href='030---operands.cc.html#L46'>Instruction_operands</a></span><span class="Delimiter">.</span>end<span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// ignore unrecognized metadata</span>
+<span id="L459" class="LineNr">459 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>metadata_found<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L460" class="LineNr">460 </span>      <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' has conflicting operand types; it should have only one\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L461" class="LineNr">461 </span>      <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L462" class="LineNr">462 </span>    <span class="Delimiter">}</span>
+<span id="L463" class="LineNr">463 </span>    metadata_found = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L464" class="LineNr">464 </span>    result = <span class="Delimiter">(</span>curr == m<span class="Delimiter">);</span>
+<span id="L465" class="LineNr">465 </span>  <span class="Delimiter">}</span>
+<span id="L466" class="LineNr">466 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L467" class="LineNr">467 </span><span class="Delimiter">}</span>
+<span id="L468" class="LineNr">468 </span>
+<span id="L469" class="LineNr">469 </span><a href='011run.cc.html#L126'>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="L470" class="LineNr">470 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L471" class="LineNr">471 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> m<span class="Delimiter">))</span>
+<span id="L472" class="LineNr">472 </span>      <span class="Identifier">return</span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L473" class="LineNr">473 </span>  assert<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">);</span>
+<span id="L474" class="LineNr">474 </span><span class="Delimiter">}</span>
+<span id="L475" class="LineNr">475 </span>
+<span id="L476" class="LineNr">476 </span><span class="Normal">bool</span> <a href='030---operands.cc.html#L476'>looks_like_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="L477" class="LineNr">477 </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="L478" class="LineNr">478 </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> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L479" class="LineNr">479 </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 class="Comment">// includes '0x' prefix</span>
+<span id="L480" class="LineNr">480 </span>  <span class="Comment">// End looks_like_hex_int(s) Detectors</span>
+<span id="L481" class="LineNr">481 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L482" class="LineNr">482 </span><span class="Delimiter">}</span>
+<span id="L483" class="LineNr">483 </span>
+<span id="L484" class="LineNr">484 </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="L485" class="LineNr">485 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L486" class="LineNr">486 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L487" class="LineNr">487 </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="L488" class="LineNr">488 </span>    out &lt;&lt; inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original<span class="Delimiter">;</span>
+<span id="L489" class="LineNr">489 </span>  <span class="Delimiter">}</span>
+<span id="L490" class="LineNr">490 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L491" class="LineNr">491 </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 4a2e78f1..4fa1f91e 100644
--- a/html/subx/031check_operands.cc.html
+++ b/html/subx/031check_operands.cc.html
@@ -15,7 +15,6 @@ body { font-size:12pt; font-family: monospace; color: #000000; background-color:
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
 .CommentedCode { color: #8a8a8a; }
-.PreProc { color: #c000c0; }
 .LineNr { }
 .Constant { color: #008787; }
 .SalientComment { color: #0000af; }
@@ -24,7 +23,7 @@ a { color:inherit; }
 .Identifier { color: #af5f00; }
 .Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 .Comment { color: #005faf; }
-.traceContains { color: #005f00; }
+.PreProc { color: #c000c0; }
 -->
 </style>
 
@@ -63,607 +62,685 @@ if ('onhashchange' in window) {
 <span id="L1" class="LineNr">  1 </span><span class="Comment">//: Since we're tagging operands with their types, let's start checking these</span>
 <span id="L2" class="LineNr">  2 </span><span class="Comment">//: operand types for each instruction.</span>
 <span id="L3" class="LineNr">  3 </span>
-<span id="L4" class="LineNr">  4 </span><span class="Delimiter">:(scenario check_missing_imm8_operand)</span>
-<span id="L5" class="LineNr">  5 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L6" class="LineNr">  6 </span>== <span class="Constant">0x1</span>
-<span id="L7" class="LineNr">  7 </span>cd  <span class="Comment"># int ??</span>
-<span id="L8" class="LineNr">  8 </span><span class="traceContains">+error: 'cd' (software interrupt): missing imm8 operand</span>
-<span id="L9" class="LineNr">  9 </span>
-<span id="L10" class="LineNr"> 10 </span><span class="Delimiter">:(before &quot;Pack Operands(segment code)&quot;)</span>
-<span id="L11" class="LineNr"> 11 </span>check_operands<span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">);</span>
-<span id="L12" class="LineNr"> 12 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L230'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L13" class="LineNr"> 13 </span>
-<span id="L14" class="LineNr"> 14 </span><span class="Delimiter">:(code)</span>
-<span id="L15" class="LineNr"> 15 </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#L11'>code</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L16" class="LineNr"> 16 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">3</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; end<span class="Delimiter">();</span>
-<span id="L17" class="LineNr"> 17 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L18" class="LineNr"> 18 </span>    check_operands<span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L19" class="LineNr"> 19 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L230'>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="L20" class="LineNr"> 20 </span>  <span class="Delimiter">}</span>
-<span id="L21" class="LineNr"> 21 </span><span class="Delimiter">}</span>
-<span id="L22" class="LineNr"> 22 </span>
-<span id="L23" class="LineNr"> 23 </span><span class="Normal">void</span> check_operands<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L24" class="LineNr"> 24 </span>  <a href='011run.cc.html#L119'>word</a> op = <a href='031check_operands.cc.html#L36'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
-<span id="L25" class="LineNr"> 25 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L26" class="LineNr"> 26 </span>    check_operands_0f<span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L27" class="LineNr"> 27 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L28" class="LineNr"> 28 </span>  <span class="Delimiter">}</span>
-<span id="L29" class="LineNr"> 29 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span>data == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L30" class="LineNr"> 30 </span>    <a href='031check_operands.cc.html#L527'>check_operands_f3</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L31" class="LineNr"> 31 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L32" class="LineNr"> 32 </span>  <span class="Delimiter">}</span>
-<span id="L33" class="LineNr"> 33 </span>  check_operands<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L34" class="LineNr"> 34 </span><span class="Delimiter">}</span>
-<span id="L35" class="LineNr"> 35 </span>
-<span id="L36" class="LineNr"> 36 </span><a href='011run.cc.html#L119'>word</a> <a href='031check_operands.cc.html#L36'>preprocess_op</a><span class="Delimiter">(</span><a href='011run.cc.html#L119'>word</a><span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L37" class="LineNr"> 37 </span>  op<span class="Delimiter">.</span>data = <a href='031check_operands.cc.html#L592'>tolower</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span>data<span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
-<span id="L38" class="LineNr"> 38 </span>  <span class="Comment">// opcodes can't be negative</span>
-<span id="L39" class="LineNr"> 39 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L102'>starts_with</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span>data<span class="Delimiter">,</span> <span class="Constant">&quot;0x&quot;</span><span class="Delimiter">))</span>
-<span id="L40" class="LineNr"> 40 </span>    op<span class="Delimiter">.</span>data = op<span class="Delimiter">.</span>data<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span>
-<span id="L41" class="LineNr"> 41 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span>data<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span>
-<span id="L42" class="LineNr"> 42 </span>    op<span class="Delimiter">.</span>data = string<span class="Delimiter">(</span><span class="Constant">&quot;0&quot;</span><span class="Delimiter">)</span>+op<span class="Delimiter">.</span>data<span class="Delimiter">;</span>
-<span id="L43" class="LineNr"> 43 </span>  <span class="Identifier">return</span> op<span class="Delimiter">;</span>
-<span id="L44" class="LineNr"> 44 </span><span class="Delimiter">}</span>
-<span id="L45" class="LineNr"> 45 </span>
-<span id="L46" class="LineNr"> 46 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L46'>test_preprocess_op</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L47" class="LineNr"> 47 </span>  <a href='011run.cc.html#L119'>word</a> w1<span class="Delimiter">;</span>  w1<span class="Delimiter">.</span>data = <span class="Constant">&quot;0xf&quot;</span><span class="Delimiter">;</span>
-<span id="L48" class="LineNr"> 48 </span>  <a href='011run.cc.html#L119'>word</a> w2<span class="Delimiter">;</span>  w2<span class="Delimiter">.</span>data = <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">;</span>
-<span id="L49" class="LineNr"> 49 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L36'>preprocess_op</a><span class="Delimiter">(</span>w1<span class="Delimiter">).</span>data<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L36'>preprocess_op</a><span class="Delimiter">(</span>w2<span class="Delimiter">).</span>data<span class="Delimiter">);</span>
-<span id="L50" class="LineNr"> 50 </span><span class="Delimiter">}</span>
-<span id="L51" class="LineNr"> 51 </span>
-<span id="L52" class="LineNr"> 52 </span><span class="Comment">//: To check the operands for an opcode, we'll track the permitted operands</span>
-<span id="L53" class="LineNr"> 53 </span><span class="Comment">//: for each supported opcode in a bitvector. That way we can often compute the</span>
-<span id="L54" class="LineNr"> 54 </span><span class="Comment">//: 'received' operand bitvector for each instruction's operands and compare</span>
-<span id="L55" class="LineNr"> 55 </span><span class="Comment">//: it with the 'expected' bitvector.</span>
-<span id="L56" class="LineNr"> 56 </span><span class="Comment">//:</span>
-<span id="L57" class="LineNr"> 57 </span><span class="Comment">//: The 'expected' and 'received' bitvectors can be different; the MODRM bit</span>
-<span id="L58" class="LineNr"> 58 </span><span class="Comment">//: in the 'expected' bitvector maps to multiple 'received' operand types in</span>
-<span id="L59" class="LineNr"> 59 </span><span class="Comment">//: an instruction. We deal in expected bitvectors throughout.</span>
-<span id="L60" class="LineNr"> 60 </span>
-<span id="L61" class="LineNr"> 61 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L62" class="LineNr"> 62 </span><span class="Normal">enum</span> <a href='031check_operands.cc.html#L62'>expected_operand_type</a> <span class="Delimiter">{</span>
-<span id="L63" class="LineNr"> 63 </span>  <span class="Comment">// start from the least significant bit</span>
-<span id="L64" class="LineNr"> 64 </span>  <a href='031check_operands.cc.html#L64'>MODRM</a><span class="Delimiter">,</span>  <span class="Comment">// more complex, may also involve disp8 or disp32</span>
-<span id="L65" class="LineNr"> 65 </span>  <a href='031check_operands.cc.html#L65'>SUBOP</a><span class="Delimiter">,</span>
-<span id="L66" class="LineNr"> 66 </span>  <a href='031check_operands.cc.html#L66'>DISP8</a><span class="Delimiter">,</span>
-<span id="L67" class="LineNr"> 67 </span>  <a href='031check_operands.cc.html#L67'>DISP16</a><span class="Delimiter">,</span>
-<span id="L68" class="LineNr"> 68 </span>  <a href='031check_operands.cc.html#L68'>DISP32</a><span class="Delimiter">,</span>
-<span id="L69" class="LineNr"> 69 </span>  <a href='031check_operands.cc.html#L69'>IMM8</a><span class="Delimiter">,</span>
-<span id="L70" class="LineNr"> 70 </span>  <a href='031check_operands.cc.html#L70'>IMM32</a><span class="Delimiter">,</span>
-<span id="L71" class="LineNr"> 71 </span>  <a href='031check_operands.cc.html#L71'>NUM_OPERAND_TYPES</a>
-<span id="L72" class="LineNr"> 72 </span><span class="Delimiter">};</span>
-<span id="L73" class="LineNr"> 73 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L74" class="LineNr"> 74 </span>vector&lt;string&gt; <span class="Special"><a href='031check_operands.cc.html#L74'>Operand_type_name</a></span><span class="Delimiter">;</span>
-<span id="L75" class="LineNr"> 75 </span>map&lt;string<span class="Delimiter">,</span> expected_operand_type&gt; <span class="Special"><a href='031check_operands.cc.html#L75'>Operand_type</a></span><span class="Delimiter">;</span>
-<span id="L76" class="LineNr"> 76 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
-<span id="L77" class="LineNr"> 77 </span><a href='031check_operands.cc.html#L79'>init_op_types</a><span class="Delimiter">();</span>
-<span id="L78" class="LineNr"> 78 </span><span class="Delimiter">:(code)</span>
-<span id="L79" class="LineNr"> 79 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L79'>init_op_types</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L80" class="LineNr"> 80 </span>  assert<span class="Delimiter">(</span><a href='031check_operands.cc.html#L71'>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="L81" class="LineNr"> 81 </span>  <span class="Special"><a href='031check_operands.cc.html#L74'>Operand_type_name</a></span><span class="Delimiter">.</span>resize<span class="Delimiter">(</span><a href='031check_operands.cc.html#L71'>NUM_OPERAND_TYPES</a><span class="Delimiter">);</span>
-<span id="L82" class="LineNr"> 82 </span>  <span class="Comment">#define DEF(type) Operand_type_name.at(type) = tolower(#type), put(Operand_type, tolower(#type), type);</span>
-<span id="L83" class="LineNr"> 83 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L64'>MODRM</a><span class="Delimiter">);</span>
-<span id="L84" class="LineNr"> 84 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L65'>SUBOP</a><span class="Delimiter">);</span>
-<span id="L85" class="LineNr"> 85 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L66'>DISP8</a><span class="Delimiter">);</span>
-<span id="L86" class="LineNr"> 86 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L67'>DISP16</a><span class="Delimiter">);</span>
-<span id="L87" class="LineNr"> 87 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L68'>DISP32</a><span class="Delimiter">);</span>
-<span id="L88" class="LineNr"> 88 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L69'>IMM8</a><span class="Delimiter">);</span>
-<span id="L89" class="LineNr"> 89 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L70'>IMM32</a><span class="Delimiter">);</span>
-<span id="L90" class="LineNr"> 90 </span>  <span class="Comment">#undef DEF</span>
-<span id="L91" class="LineNr"> 91 </span><span class="Delimiter">}</span>
-<span id="L92" class="LineNr"> 92 </span>
-<span id="L93" class="LineNr"> 93 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L94" class="LineNr"> 94 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">bitvector</span><span class="Comment">*/</span><span class="Normal">uint8_t</span>&gt; <span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">;</span>
-<span id="L95" class="LineNr"> 95 </span><span class="Normal">const</span> <span class="Normal">uint8_t</span> <a href='031check_operands.cc.html#L95'>INVALID_OPERANDS</a> = <span class="Constant">0xff</span><span class="Delimiter">;</span>  <span class="Comment">// no instruction uses all the operand types</span>
-<span id="L96" class="LineNr"> 96 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
-<span id="L97" class="LineNr"> 97 </span><a href='031check_operands.cc.html#L99'>init_permitted_operands</a><span class="Delimiter">();</span>
-<span id="L98" class="LineNr"> 98 </span><span class="Delimiter">:(code)</span>
-<span id="L99" class="LineNr"> 99 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L99'>init_permitted_operands</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L100" class="LineNr">100 </span>  <span class="SalientComment">//// Class A: just op, no operands</span>
-<span id="L101" class="LineNr">101 </span>  <span class="Comment">// halt</span>
-<span id="L102" class="LineNr">102 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;f4&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L103" class="LineNr">103 </span>  <span class="Comment">// inc</span>
-<span id="L104" class="LineNr">104 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;40&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L105" class="LineNr">105 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;41&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L106" class="LineNr">106 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;42&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L107" class="LineNr">107 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;43&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L108" class="LineNr">108 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;44&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L109" class="LineNr">109 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;45&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L110" class="LineNr">110 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;46&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L111" class="LineNr">111 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;47&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L112" class="LineNr">112 </span>  <span class="Comment">// dec</span>
-<span id="L113" class="LineNr">113 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;48&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L114" class="LineNr">114 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;49&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L115" class="LineNr">115 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4a&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L116" class="LineNr">116 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L117" class="LineNr">117 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L118" class="LineNr">118 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L119" class="LineNr">119 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L120" class="LineNr">120 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L121" class="LineNr">121 </span>  <span class="Comment">// push</span>
-<span id="L122" class="LineNr">122 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;50&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L123" class="LineNr">123 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;51&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L124" class="LineNr">124 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;52&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L125" class="LineNr">125 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;53&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L126" class="LineNr">126 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;54&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L127" class="LineNr">127 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;55&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L128" class="LineNr">128 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;56&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L129" class="LineNr">129 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;57&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L130" class="LineNr">130 </span>  <span class="Comment">// pop</span>
-<span id="L131" class="LineNr">131 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;58&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L132" class="LineNr">132 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;59&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L133" class="LineNr">133 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5a&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L134" class="LineNr">134 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L135" class="LineNr">135 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L136" class="LineNr">136 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L137" class="LineNr">137 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L138" class="LineNr">138 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L139" class="LineNr">139 </span>  <span class="Comment">// return</span>
-<span id="L140" class="LineNr">140 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c3&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L141" class="LineNr">141 </span>
-<span id="L142" class="LineNr">142 </span>  <span class="SalientComment">//// Class B: just op and disp8</span>
-<span id="L143" class="LineNr">143 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L144" class="LineNr">144 </span>  <span class="Comment">//  0     0     0      |0       1     0     0</span>
-<span id="L145" class="LineNr">145 </span>
-<span id="L146" class="LineNr">146 </span>  <span class="Comment">// jump</span>
-<span id="L147" class="LineNr">147 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;eb&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L148" class="LineNr">148 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;74&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L149" class="LineNr">149 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;75&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L150" class="LineNr">150 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L151" class="LineNr">151 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L152" class="LineNr">152 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L153" class="LineNr">153 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L154" class="LineNr">154 </span>
-<span id="L155" class="LineNr">155 </span>  <span class="SalientComment">//// Class D: just op and disp32</span>
-<span id="L156" class="LineNr">156 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L157" class="LineNr">157 </span>  <span class="Comment">//  0     0     1      |0       0     0     0</span>
-<span id="L158" class="LineNr">158 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;e8&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>  <span class="Comment">// call</span>
-<span id="L159" class="LineNr">159 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;e9&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>  <span class="Comment">// jump</span>
-<span id="L160" class="LineNr">160 </span>
-<span id="L161" class="LineNr">161 </span>  <span class="SalientComment">//// Class E: just op and imm8</span>
-<span id="L162" class="LineNr">162 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L163" class="LineNr">163 </span>  <span class="Comment">//  0     1     0      |0       0     0     0</span>
-<span id="L164" class="LineNr">164 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;cd&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x20</span><span class="Delimiter">);</span>  <span class="Comment">// software interrupt</span>
+<span id="L4" class="LineNr">  4 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L4'>test_check_missing_imm8_operand</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L5" class="LineNr">  5 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L6" class="LineNr">  6 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L7" class="LineNr">  7 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L8" class="LineNr">  8 </span>      <span class="Constant">&quot;cd\n&quot;</span>  <span class="Comment">// interrupt ??</span>
+<span id="L9" class="LineNr">  9 </span>  <span class="Delimiter">);</span>
+<span id="L10" class="LineNr"> 10 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L11" class="LineNr"> 11 </span>      <span class="Constant">&quot;error: 'cd' (software interrupt): missing imm8 operand\n&quot;</span>
+<span id="L12" class="LineNr"> 12 </span>  <span class="Delimiter">);</span>
+<span id="L13" class="LineNr"> 13 </span><span class="Delimiter">}</span>
+<span id="L14" class="LineNr"> 14 </span>
+<span id="L15" class="LineNr"> 15 </span><span class="Delimiter">:(before &quot;Pack Operands(segment code)&quot;)</span>
+<span id="L16" class="LineNr"> 16 </span>check_operands<span class="Delimiter">(</span>code<span class="Delimiter">);</span>
+<span id="L17" class="LineNr"> 17 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L238'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L18" class="LineNr"> 18 </span>
+<span id="L19" class="LineNr"> 19 </span><span class="Delimiter">:(code)</span>
+<span id="L20" class="LineNr"> 20 </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="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">3</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; end<span class="Delimiter">();</span>
+<span id="L22" class="LineNr"> 22 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>code<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L23" class="LineNr"> 23 </span>    check_operands<span class="Delimiter">(</span>code<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L24" class="LineNr"> 24 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L238'>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="L25" class="LineNr"> 25 </span>  <span class="Delimiter">}</span>
+<span id="L26" class="LineNr"> 26 </span><span class="Delimiter">}</span>
+<span id="L27" class="LineNr"> 27 </span>
+<span id="L28" class="LineNr"> 28 </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="L29" class="LineNr"> 29 </span>  <a href='011run.cc.html#L126'>word</a> op = <a href='031check_operands.cc.html#L41'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
+<span id="L30" class="LineNr"> 30 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L31" class="LineNr"> 31 </span>    check_operands_0f<span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L32" class="LineNr"> 32 </span>    <span class="Identifier">return</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="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span>data == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L35" class="LineNr"> 35 </span>    <a href='031check_operands.cc.html#L603'>check_operands_f3</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L36" class="LineNr"> 36 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L37" class="LineNr"> 37 </span>  <span class="Delimiter">}</span>
+<span id="L38" class="LineNr"> 38 </span>  check_operands<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L39" class="LineNr"> 39 </span><span class="Delimiter">}</span>
+<span id="L40" class="LineNr"> 40 </span>
+<span id="L41" class="LineNr"> 41 </span><a href='011run.cc.html#L126'>word</a> <a href='031check_operands.cc.html#L41'>preprocess_op</a><span class="Delimiter">(</span><a href='011run.cc.html#L126'>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="L42" class="LineNr"> 42 </span>  op<span class="Delimiter">.</span>data = <a href='031check_operands.cc.html#L670'>tolower</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span>data<span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
+<span id="L43" class="LineNr"> 43 </span>  <span class="Comment">// opcodes can't be negative</span>
+<span id="L44" class="LineNr"> 44 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L102'>starts_with</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span>data<span class="Delimiter">,</span> <span class="Constant">&quot;0x&quot;</span><span class="Delimiter">))</span>
+<span id="L45" class="LineNr"> 45 </span>    op<span class="Delimiter">.</span>data = op<span class="Delimiter">.</span>data<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span>
+<span id="L46" class="LineNr"> 46 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span>data<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span>
+<span id="L47" class="LineNr"> 47 </span>    op<span class="Delimiter">.</span>data = string<span class="Delimiter">(</span><span class="Constant">&quot;0&quot;</span><span class="Delimiter">)</span>+op<span class="Delimiter">.</span>data<span class="Delimiter">;</span>
+<span id="L48" class="LineNr"> 48 </span>  <span class="Identifier">return</span> op<span class="Delimiter">;</span>
+<span id="L49" class="LineNr"> 49 </span><span class="Delimiter">}</span>
+<span id="L50" class="LineNr"> 50 </span>
+<span id="L51" class="LineNr"> 51 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L51'>test_preprocess_op</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L52" class="LineNr"> 52 </span>  <a href='011run.cc.html#L126'>word</a> w1<span class="Delimiter">;</span>  w1<span class="Delimiter">.</span>data = <span class="Constant">&quot;0xf&quot;</span><span class="Delimiter">;</span>
+<span id="L53" class="LineNr"> 53 </span>  <a href='011run.cc.html#L126'>word</a> w2<span class="Delimiter">;</span>  w2<span class="Delimiter">.</span>data = <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">;</span>
+<span id="L54" class="LineNr"> 54 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L41'>preprocess_op</a><span class="Delimiter">(</span>w1<span class="Delimiter">).</span>data<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L41'>preprocess_op</a><span class="Delimiter">(</span>w2<span class="Delimiter">).</span>data<span class="Delimiter">);</span>
+<span id="L55" class="LineNr"> 55 </span><span class="Delimiter">}</span>
+<span id="L56" class="LineNr"> 56 </span>
+<span id="L57" class="LineNr"> 57 </span><span class="Comment">//: To check the operands for an opcode, we'll track the permitted operands</span>
+<span id="L58" class="LineNr"> 58 </span><span class="Comment">//: for each supported opcode in a bitvector. That way we can often compute the</span>
+<span id="L59" class="LineNr"> 59 </span><span class="Comment">//: 'received' operand bitvector for each instruction's operands and compare</span>
+<span id="L60" class="LineNr"> 60 </span><span class="Comment">//: it with the 'expected' bitvector.</span>
+<span id="L61" class="LineNr"> 61 </span><span class="Comment">//:</span>
+<span id="L62" class="LineNr"> 62 </span><span class="Comment">//: The 'expected' and 'received' bitvectors can be different; the MODRM bit</span>
+<span id="L63" class="LineNr"> 63 </span><span class="Comment">//: in the 'expected' bitvector maps to multiple 'received' operand types in</span>
+<span id="L64" class="LineNr"> 64 </span><span class="Comment">//: an instruction. We deal in expected bitvectors throughout.</span>
+<span id="L65" class="LineNr"> 65 </span>
+<span id="L66" class="LineNr"> 66 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L67" class="LineNr"> 67 </span><span class="Normal">enum</span> <a href='031check_operands.cc.html#L67'>expected_operand_type</a> <span class="Delimiter">{</span>
+<span id="L68" class="LineNr"> 68 </span>  <span class="Comment">// start from the least significant bit</span>
+<span id="L69" class="LineNr"> 69 </span>  <a href='031check_operands.cc.html#L69'>MODRM</a><span class="Delimiter">,</span>  <span class="Comment">// more complex, may also involve disp8 or disp32</span>
+<span id="L70" class="LineNr"> 70 </span>  <a href='031check_operands.cc.html#L70'>SUBOP</a><span class="Delimiter">,</span>
+<span id="L71" class="LineNr"> 71 </span>  <a href='031check_operands.cc.html#L71'>DISP8</a><span class="Delimiter">,</span>
+<span id="L72" class="LineNr"> 72 </span>  <a href='031check_operands.cc.html#L72'>DISP16</a><span class="Delimiter">,</span>
+<span id="L73" class="LineNr"> 73 </span>  <a href='031check_operands.cc.html#L73'>DISP32</a><span class="Delimiter">,</span>
+<span id="L74" class="LineNr"> 74 </span>  <a href='031check_operands.cc.html#L74'>IMM8</a><span class="Delimiter">,</span>
+<span id="L75" class="LineNr"> 75 </span>  <a href='031check_operands.cc.html#L75'>IMM32</a><span class="Delimiter">,</span>
+<span id="L76" class="LineNr"> 76 </span>  <a href='031check_operands.cc.html#L76'>NUM_OPERAND_TYPES</a>
+<span id="L77" class="LineNr"> 77 </span><span class="Delimiter">};</span>
+<span id="L78" class="LineNr"> 78 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L79" class="LineNr"> 79 </span>vector&lt;string&gt; <span class="Special"><a href='031check_operands.cc.html#L79'>Operand_type_name</a></span><span class="Delimiter">;</span>
+<span id="L80" class="LineNr"> 80 </span>map&lt;string<span class="Delimiter">,</span> expected_operand_type&gt; <span class="Special"><a href='031check_operands.cc.html#L80'>Operand_type</a></span><span class="Delimiter">;</span>
+<span id="L81" class="LineNr"> 81 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
+<span id="L82" class="LineNr"> 82 </span><a href='031check_operands.cc.html#L84'>init_op_types</a><span class="Delimiter">();</span>
+<span id="L83" class="LineNr"> 83 </span><span class="Delimiter">:(code)</span>
+<span id="L84" class="LineNr"> 84 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L84'>init_op_types</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L85" class="LineNr"> 85 </span>  assert<span class="Delimiter">(</span><a href='031check_operands.cc.html#L76'>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="L86" class="LineNr"> 86 </span>  <span class="Special"><a href='031check_operands.cc.html#L79'>Operand_type_name</a></span><span class="Delimiter">.</span>resize<span class="Delimiter">(</span><a href='031check_operands.cc.html#L76'>NUM_OPERAND_TYPES</a><span class="Delimiter">);</span>
+<span id="L87" class="LineNr"> 87 </span>  <span class="PreProc">#define DEF(type) </span><span class="Special">Operand_type_name</span><span class="Delimiter">.</span><span class="PreProc">at(type) = tolower(#type)</span><span class="Delimiter">,</span><span class="PreProc"> put(</span><span class="Special">Operand_type</span><span class="Delimiter">,</span><span class="PreProc"> tolower(#type)</span><span class="Delimiter">,</span><span class="PreProc"> type)</span><span class="Delimiter">;</span>
+<span id="L88" class="LineNr"> 88 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L69'>MODRM</a><span class="Delimiter">);</span>
+<span id="L89" class="LineNr"> 89 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L70'>SUBOP</a><span class="Delimiter">);</span>
+<span id="L90" class="LineNr"> 90 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L71'>DISP8</a><span class="Delimiter">);</span>
+<span id="L91" class="LineNr"> 91 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L72'>DISP16</a><span class="Delimiter">);</span>
+<span id="L92" class="LineNr"> 92 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L73'>DISP32</a><span class="Delimiter">);</span>
+<span id="L93" class="LineNr"> 93 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L74'>IMM8</a><span class="Delimiter">);</span>
+<span id="L94" class="LineNr"> 94 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L75'>IMM32</a><span class="Delimiter">);</span>
+<span id="L95" class="LineNr"> 95 </span>  <span class="PreProc">#undef DEF</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 Globals&quot;)</span>
+<span id="L99" class="LineNr"> 99 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">bitvector</span><span class="Comment">*/</span><span class="Normal">uint8_t</span>&gt; <span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">;</span>
+<span id="L100" class="LineNr">100 </span><span class="Normal">const</span> <span class="Normal">uint8_t</span> <a href='031check_operands.cc.html#L100'>INVALID_OPERANDS</a> = <span class="Constant">0xff</span><span class="Delimiter">;</span>  <span class="Comment">// no instruction uses all the operand types</span>
+<span id="L101" class="LineNr">101 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
+<span id="L102" class="LineNr">102 </span><a href='031check_operands.cc.html#L104'>init_permitted_operands</a><span class="Delimiter">();</span>
+<span id="L103" class="LineNr">103 </span><span class="Delimiter">:(code)</span>
+<span id="L104" class="LineNr">104 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L104'>init_permitted_operands</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L105" class="LineNr">105 </span>  <span class="SalientComment">//// Class A: just op, no operands</span>
+<span id="L106" class="LineNr">106 </span>  <span class="Comment">// halt</span>
+<span id="L107" class="LineNr">107 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;f4&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L108" class="LineNr">108 </span>  <span class="Comment">// inc</span>
+<span id="L109" class="LineNr">109 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;40&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L110" class="LineNr">110 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;41&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L111" class="LineNr">111 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;42&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L112" class="LineNr">112 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;43&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L113" class="LineNr">113 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;44&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L114" class="LineNr">114 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;45&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L115" class="LineNr">115 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;46&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L116" class="LineNr">116 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;47&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L117" class="LineNr">117 </span>  <span class="Comment">// dec</span>
+<span id="L118" class="LineNr">118 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;48&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L119" class="LineNr">119 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;49&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L120" class="LineNr">120 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4a&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L121" class="LineNr">121 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L122" class="LineNr">122 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L123" class="LineNr">123 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L124" class="LineNr">124 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L125" class="LineNr">125 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L126" class="LineNr">126 </span>  <span class="Comment">// push</span>
+<span id="L127" class="LineNr">127 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;50&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L128" class="LineNr">128 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;51&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L129" class="LineNr">129 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;52&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L130" class="LineNr">130 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;53&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L131" class="LineNr">131 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;54&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L132" class="LineNr">132 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;55&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L133" class="LineNr">133 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;56&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L134" class="LineNr">134 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;57&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L135" class="LineNr">135 </span>  <span class="Comment">// pop</span>
+<span id="L136" class="LineNr">136 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;58&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L137" class="LineNr">137 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;59&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L138" class="LineNr">138 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5a&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L139" class="LineNr">139 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L140" class="LineNr">140 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L141" class="LineNr">141 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L142" class="LineNr">142 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L143" class="LineNr">143 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L144" class="LineNr">144 </span>  <span class="Comment">// return</span>
+<span id="L145" class="LineNr">145 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c3&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L146" class="LineNr">146 </span>
+<span id="L147" class="LineNr">147 </span>  <span class="SalientComment">//// Class B: just op and disp8</span>
+<span id="L148" class="LineNr">148 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L149" class="LineNr">149 </span>  <span class="Comment">//  0     0     0      |0       1     0     0</span>
+<span id="L150" class="LineNr">150 </span>
+<span id="L151" class="LineNr">151 </span>  <span class="Comment">// jump</span>
+<span id="L152" class="LineNr">152 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;eb&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
+<span id="L153" class="LineNr">153 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;74&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
+<span id="L154" class="LineNr">154 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;75&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
+<span id="L155" class="LineNr">155 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
+<span id="L156" class="LineNr">156 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
+<span id="L157" class="LineNr">157 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
+<span id="L158" class="LineNr">158 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
+<span id="L159" class="LineNr">159 </span>
+<span id="L160" class="LineNr">160 </span>  <span class="SalientComment">//// Class D: just op and disp32</span>
+<span id="L161" class="LineNr">161 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L162" class="LineNr">162 </span>  <span class="Comment">//  0     0     1      |0       0     0     0</span>
+<span id="L163" class="LineNr">163 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;e8&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>  <span class="Comment">// call</span>
+<span id="L164" class="LineNr">164 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;e9&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>  <span class="Comment">// jump</span>
 <span id="L165" class="LineNr">165 </span>
-<span id="L166" class="LineNr">166 </span>  <span class="SalientComment">//// Class F: just op and imm32</span>
+<span id="L166" class="LineNr">166 </span>  <span class="SalientComment">//// Class E: just op and imm8</span>
 <span id="L167" class="LineNr">167 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L168" class="LineNr">168 </span>  <span class="Comment">//  1     0     0      |0       0     0     0</span>
-<span id="L169" class="LineNr">169 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;05&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// add</span>
-<span id="L170" class="LineNr">170 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;2d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// subtract</span>
-<span id="L171" class="LineNr">171 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;25&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// and</span>
-<span id="L172" class="LineNr">172 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;0d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// or</span>
-<span id="L173" class="LineNr">173 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;35&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// xor</span>
-<span id="L174" class="LineNr">174 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;3d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// compare</span>
-<span id="L175" class="LineNr">175 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;68&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// push</span>
-<span id="L176" class="LineNr">176 </span>  <span class="Comment">// copy</span>
-<span id="L177" class="LineNr">177 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;b8&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L178" class="LineNr">178 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;b9&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L179" class="LineNr">179 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;ba&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L180" class="LineNr">180 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bb&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L181" class="LineNr">181 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bc&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L182" class="LineNr">182 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bd&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L183" class="LineNr">183 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;be&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L184" class="LineNr">184 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bf&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L185" class="LineNr">185 </span>
-<span id="L186" class="LineNr">186 </span>  <span class="SalientComment">//// Class M: using ModR/M byte</span>
-<span id="L187" class="LineNr">187 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L188" class="LineNr">188 </span>  <span class="Comment">//  0     0     0      |0       0     0     1</span>
-<span id="L189" class="LineNr">189 </span>
-<span id="L190" class="LineNr">190 </span>  <span class="Comment">// add</span>
-<span id="L191" class="LineNr">191 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;01&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L192" class="LineNr">192 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;03&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L193" class="LineNr">193 </span>  <span class="Comment">// subtract</span>
-<span id="L194" class="LineNr">194 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;29&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L195" class="LineNr">195 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;2b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L196" class="LineNr">196 </span>  <span class="Comment">// and</span>
-<span id="L197" class="LineNr">197 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;21&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#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;23&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">// or</span>
-<span id="L200" class="LineNr">200 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;09&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L201" class="LineNr">201 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;0b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L202" class="LineNr">202 </span>  <span class="Comment">// xor</span>
-<span id="L203" class="LineNr">203 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;31&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L204" class="LineNr">204 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;33&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L205" class="LineNr">205 </span>  <span class="Comment">// compare</span>
-<span id="L206" class="LineNr">206 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><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="L207" class="LineNr">207 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><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="L208" class="LineNr">208 </span>  <span class="Comment">// copy</span>
-<span id="L209" class="LineNr">209 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><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="L210" class="LineNr">210 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><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="L211" class="LineNr">211 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><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="L212" class="LineNr">212 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><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="L213" class="LineNr">213 </span>  <span class="Comment">// swap</span>
-<span id="L214" class="LineNr">214 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><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="L215" class="LineNr">215 </span>  <span class="Comment">// copy address (lea)</span>
-<span id="L216" class="LineNr">216 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L217" class="LineNr">217 </span>  <span class="Comment">// pop</span>
-<span id="L218" class="LineNr">218 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L219" class="LineNr">219 </span>
-<span id="L220" class="LineNr">220 </span>  <span class="SalientComment">//// Class N: op, ModR/M and subop (not r32)</span>
-<span id="L221" class="LineNr">221 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L222" class="LineNr">222 </span>  <span class="Comment">//  0     0     0      |0       0     1     1</span>
-<span id="L223" class="LineNr">223 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;d3&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// shift</span>
-<span id="L224" class="LineNr">224 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;f7&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// test/not/mul/div</span>
-<span id="L225" class="LineNr">225 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// jump/push/call</span>
-<span id="L226" class="LineNr">226 </span>
-<span id="L227" class="LineNr">227 </span>  <span class="SalientComment">//// Class O: op, ModR/M, subop (not r32) and imm8</span>
-<span id="L228" class="LineNr">228 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L229" class="LineNr">229 </span>  <span class="Comment">//  0     1     0      |0       0     1     1</span>
-<span id="L230" class="LineNr">230 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c1&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x23</span><span class="Delimiter">);</span>  <span class="Comment">// combine</span>
-<span id="L231" class="LineNr">231 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c6&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x23</span><span class="Delimiter">);</span>  <span class="Comment">// copy</span>
-<span id="L232" class="LineNr">232 </span>
-<span id="L233" class="LineNr">233 </span>  <span class="SalientComment">//// Class P: op, ModR/M, subop (not r32) and imm32</span>
-<span id="L234" class="LineNr">234 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L235" class="LineNr">235 </span>  <span class="Comment">//  1     0     0      |0       0     1     1</span>
-<span id="L236" class="LineNr">236 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;81&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x43</span><span class="Delimiter">);</span>  <span class="Comment">// combine</span>
-<span id="L237" class="LineNr">237 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x43</span><span class="Delimiter">);</span>  <span class="Comment">// copy</span>
-<span id="L238" class="LineNr">238 </span>
-<span id="L239" class="LineNr">239 </span>  <span class="Comment">// End Init Permitted Operands</span>
-<span id="L240" class="LineNr">240 </span><span class="Delimiter">}</span>
-<span id="L241" class="LineNr">241 </span>
-<span id="L242" class="LineNr">242 </span><span class="Delimiter">:(code)</span>
-<span id="L243" class="LineNr">243 </span><span class="Comment">#define HAS(bitvector, bit)  ((bitvector) &amp; (1 &lt;&lt; (bit)))</span>
-<span id="L244" class="LineNr">244 </span><span class="Comment">#define SET(bitvector, bit)  ((bitvector) | (1 &lt;&lt; (bit)))</span>
-<span id="L245" class="LineNr">245 </span><span class="Comment">#define CLEAR(bitvector, bit)  ((bitvector) &amp; (~(1 &lt;&lt; (bit))))</span>
+<span id="L168" class="LineNr">168 </span>  <span class="Comment">//  0     1     0      |0       0     0     0</span>
+<span id="L169" class="LineNr">169 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;cd&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x20</span><span class="Delimiter">);</span>  <span class="Comment">// software interrupt</span>
+<span id="L170" class="LineNr">170 </span>
+<span id="L171" class="LineNr">171 </span>  <span class="SalientComment">//// Class F: just op and imm32</span>
+<span id="L172" class="LineNr">172 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L173" class="LineNr">173 </span>  <span class="Comment">//  1     0     0      |0       0     0     0</span>
+<span id="L174" class="LineNr">174 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;05&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// add</span>
+<span id="L175" class="LineNr">175 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;2d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// subtract</span>
+<span id="L176" class="LineNr">176 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;25&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// and</span>
+<span id="L177" class="LineNr">177 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;0d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// or</span>
+<span id="L178" class="LineNr">178 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;35&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// xor</span>
+<span id="L179" class="LineNr">179 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;3d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// compare</span>
+<span id="L180" class="LineNr">180 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;68&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// push</span>
+<span id="L181" class="LineNr">181 </span>  <span class="Comment">// copy</span>
+<span id="L182" class="LineNr">182 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;b8&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L183" class="LineNr">183 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;b9&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L184" class="LineNr">184 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;ba&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L185" class="LineNr">185 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bb&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L186" class="LineNr">186 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bc&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L187" class="LineNr">187 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bd&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L188" class="LineNr">188 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;be&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L189" class="LineNr">189 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bf&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L190" class="LineNr">190 </span>
+<span id="L191" class="LineNr">191 </span>  <span class="SalientComment">//// Class M: using ModR/M byte</span>
+<span id="L192" class="LineNr">192 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L193" class="LineNr">193 </span>  <span class="Comment">//  0     0     0      |0       0     0     1</span>
+<span id="L194" class="LineNr">194 </span>
+<span id="L195" class="LineNr">195 </span>  <span class="Comment">// add</span>
+<span id="L196" class="LineNr">196 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;01&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#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;03&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L198" class="LineNr">198 </span>  <span class="Comment">// subtract</span>
+<span id="L199" class="LineNr">199 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;29&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L200" class="LineNr">200 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;2b&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">// and</span>
+<span id="L202" class="LineNr">202 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;21&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L203" class="LineNr">203 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;23&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L204" class="LineNr">204 </span>  <span class="Comment">// or</span>
+<span id="L205" class="LineNr">205 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;09&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L206" class="LineNr">206 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;0b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L207" class="LineNr">207 </span>  <span class="Comment">// xor</span>
+<span id="L208" class="LineNr">208 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;31&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L209" class="LineNr">209 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;33&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L210" class="LineNr">210 </span>  <span class="Comment">// compare</span>
+<span id="L211" class="LineNr">211 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><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="L212" class="LineNr">212 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><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="L213" class="LineNr">213 </span>  <span class="Comment">// copy</span>
+<span id="L214" class="LineNr">214 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><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="L215" class="LineNr">215 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><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="L216" class="LineNr">216 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><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="L217" class="LineNr">217 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><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="L218" class="LineNr">218 </span>  <span class="Comment">// swap</span>
+<span id="L219" class="LineNr">219 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><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="L220" class="LineNr">220 </span>  <span class="Comment">// copy address (lea)</span>
+<span id="L221" class="LineNr">221 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L222" class="LineNr">222 </span>  <span class="Comment">// pop</span>
+<span id="L223" class="LineNr">223 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L224" class="LineNr">224 </span>
+<span id="L225" class="LineNr">225 </span>  <span class="SalientComment">//// Class N: op, ModR/M and subop (not r32)</span>
+<span id="L226" class="LineNr">226 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L227" class="LineNr">227 </span>  <span class="Comment">//  0     0     0      |0       0     1     1</span>
+<span id="L228" class="LineNr">228 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;d3&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// shift</span>
+<span id="L229" class="LineNr">229 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;f7&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// test/not/mul/div</span>
+<span id="L230" class="LineNr">230 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// jump/push/call</span>
+<span id="L231" class="LineNr">231 </span>
+<span id="L232" class="LineNr">232 </span>  <span class="SalientComment">//// Class O: op, ModR/M, subop (not r32) and imm8</span>
+<span id="L233" class="LineNr">233 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L234" class="LineNr">234 </span>  <span class="Comment">//  0     1     0      |0       0     1     1</span>
+<span id="L235" class="LineNr">235 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c1&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x23</span><span class="Delimiter">);</span>  <span class="Comment">// combine</span>
+<span id="L236" class="LineNr">236 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c6&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x23</span><span class="Delimiter">);</span>  <span class="Comment">// copy</span>
+<span id="L237" class="LineNr">237 </span>
+<span id="L238" class="LineNr">238 </span>  <span class="SalientComment">//// Class P: op, ModR/M, subop (not r32) and imm32</span>
+<span id="L239" class="LineNr">239 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L240" class="LineNr">240 </span>  <span class="Comment">//  1     0     0      |0       0     1     1</span>
+<span id="L241" class="LineNr">241 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;81&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x43</span><span class="Delimiter">);</span>  <span class="Comment">// combine</span>
+<span id="L242" class="LineNr">242 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x43</span><span class="Delimiter">);</span>  <span class="Comment">// copy</span>
+<span id="L243" class="LineNr">243 </span>
+<span id="L244" class="LineNr">244 </span>  <span class="Comment">// End Init Permitted Operands</span>
+<span id="L245" class="LineNr">245 </span><span class="Delimiter">}</span>
 <span id="L246" class="LineNr">246 </span>
-<span id="L247" class="LineNr">247 </span><span class="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="L248" class="LineNr">248 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>op<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L249" class="LineNr">249 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L250" class="LineNr">250 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>HAS<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L64'>MODRM</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L251" class="LineNr">251 </span>    <a href='031check_operands.cc.html#L354'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L252" class="LineNr">252 </span>    <a href='031check_operands.cc.html#L380'>compare_bitvector_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> expected_bitvector<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L253" class="LineNr">253 </span>  <span class="Delimiter">}</span>
-<span id="L254" class="LineNr">254 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L255" class="LineNr">255 </span>    <a href='031check_operands.cc.html#L261'>compare_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> expected_bitvector<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L256" class="LineNr">256 </span>  <span class="Delimiter">}</span>
-<span id="L257" class="LineNr">257 </span><span class="Delimiter">}</span>
-<span id="L258" class="LineNr">258 </span>
-<span id="L259" class="LineNr">259 </span><span class="Comment">//: Many instructions can be checked just by comparing bitvectors.</span>
-<span id="L260" class="LineNr">260 </span>
-<span id="L261" class="LineNr">261 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L261'>compare_bitvector</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L262" class="LineNr">262 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L297'>has_operands</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
-<span id="L263" class="LineNr">263 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L287'>compute_expected_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L264" class="LineNr">264 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L230'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
-<span id="L265" class="LineNr">265 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>bitvector == expected<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this instruction</span>
-<span id="L266" class="LineNr">266 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L71'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L267" class="LineNr">267 </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="L268" class="LineNr">268 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> == <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="L269" class="LineNr">269 </span>    <span class="Normal">const</span> string&amp; optype = <span class="Special"><a href='031check_operands.cc.html#L74'>Operand_type_name</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L270" class="LineNr">270 </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="L271" class="LineNr">271 </span>      <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L279'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L272" class="LineNr">272 </span>    <span class="Normal">else</span>
-<span id="L273" class="LineNr">273 </span>      <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L279'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L274" class="LineNr">274 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
-<span id="L275" class="LineNr">275 </span>  <span class="Delimiter">}</span>
-<span id="L276" class="LineNr">276 </span>  <span class="Comment">// ignore settings in any unused bits</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 <a href='031check_operands.cc.html#L279'>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="L280" class="LineNr">280 </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="L281" class="LineNr">281 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L282" class="LineNr">282 </span>  <span class="Comment">// strip stuff in parens from the name</span>
-<span id="L283" class="LineNr">283 </span>  <span class="Normal">const</span> string&amp; s = get<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L380'>Name</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L284" class="LineNr">284 </span>  <span class="Identifier">return</span> <span class="Constant">&quot; (&quot;</span>+s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> s<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot; (&quot;</span><span class="Delimiter">))</span>+<span class="Constant">')'</span><span class="Delimiter">;</span>
-<span id="L285" class="LineNr">285 </span><span class="Delimiter">}</span>
-<span id="L286" class="LineNr">286 </span>
-<span id="L287" class="LineNr">287 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L287'>compute_expected_operand_bitvector</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L288" class="LineNr">288 </span>  set&lt;string&gt; operands_found<span class="Delimiter">;</span>
-<span id="L289" class="LineNr">289 </span>  <span class="Normal">uint32_t</span> bitvector = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L290" class="LineNr">290 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip op</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L291" class="LineNr">291 </span>    bitvector = bitvector | <a href='031check_operands.cc.html#L314'>expected_bit_for_received_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> operands_found<span class="Delimiter">,</span> inst<span class="Delimiter">);</span>
-<span id="L292" class="LineNr">292 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L230'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <a href='031check_operands.cc.html#L95'>INVALID_OPERANDS</a><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
-<span id="L293" class="LineNr">293 </span>  <span class="Delimiter">}</span>
-<span id="L294" class="LineNr">294 </span>  <span class="Identifier">return</span> bitvector<span class="Delimiter">;</span>
-<span id="L295" class="LineNr">295 </span><span class="Delimiter">}</span>
-<span id="L296" class="LineNr">296 </span>
-<span id="L297" class="LineNr">297 </span><span class="Normal">bool</span> <a href='031check_operands.cc.html#L297'>has_operands</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L298" class="LineNr">298 </span>  <span class="Identifier">return</span> <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">)</span> &gt; <a href='031check_operands.cc.html#L301'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L247" class="LineNr">247 </span><span class="PreProc">#define HAS(bitvector</span><span class="Delimiter">,</span><span class="PreProc"> bit)  ((bitvector) &amp; (</span><span class="Constant">1</span><span class="PreProc"> &lt;&lt; (bit)))</span>
+<span id="L248" class="LineNr">248 </span><span class="PreProc">#define SET(bitvector</span><span class="Delimiter">,</span><span class="PreProc"> bit)  ((bitvector) | (</span><span class="Constant">1</span><span class="PreProc"> &lt;&lt; (bit)))</span>
+<span id="L249" class="LineNr">249 </span><span class="PreProc">#define CLEAR(bitvector</span><span class="Delimiter">,</span><span class="PreProc"> bit)  ((bitvector) &amp; (~(</span><span class="Constant">1</span><span class="PreProc"> &lt;&lt; (bit))))</span>
+<span id="L250" class="LineNr">250 </span>
+<span id="L251" class="LineNr">251 </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="L252" class="LineNr">252 </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="L253" class="LineNr">253 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L99'>Permitted_operands</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L254" class="LineNr">254 </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#L69'>MODRM</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L255" class="LineNr">255 </span>    <a href='031check_operands.cc.html#L367'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L256" class="LineNr">256 </span>    <a href='031check_operands.cc.html#L393'>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="L257" class="LineNr">257 </span>  <span class="Delimiter">}</span>
+<span id="L258" class="LineNr">258 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L259" class="LineNr">259 </span>    <a href='031check_operands.cc.html#L265'>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="L260" class="LineNr">260 </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="Comment">//: Many instructions can be checked just by comparing bitvectors.</span>
+<span id="L264" class="LineNr">264 </span>
+<span id="L265" class="LineNr">265 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L265'>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="L266" class="LineNr">266 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L416'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L301'>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="L267" class="LineNr">267 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L291'>compute_expected_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L268" class="LineNr">268 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L238'>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="L269" class="LineNr">269 </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="L270" class="LineNr">270 </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#L76'>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="L271" class="LineNr">271 </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="L272" class="LineNr">272 </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="L273" class="LineNr">273 </span>    <span class="Normal">const</span> string&amp; optype = <span class="Special"><a href='031check_operands.cc.html#L79'>Operand_type_name</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L274" class="LineNr">274 </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="L275" class="LineNr">275 </span>      <a href='003trace.cc.html#L202'>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#L283'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L276" class="LineNr">276 </span>    <span class="Normal">else</span>
+<span id="L277" class="LineNr">277 </span>      <a href='003trace.cc.html#L202'>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#L283'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L278" class="LineNr">278 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
+<span id="L279" class="LineNr">279 </span>  <span class="Delimiter">}</span>
+<span id="L280" class="LineNr">280 </span>  <span class="Comment">// ignore settings in any unused bits</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>string <a href='031check_operands.cc.html#L283'>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="L284" class="LineNr">284 </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="L285" class="LineNr">285 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L286" class="LineNr">286 </span>  <span class="Comment">// strip stuff in parens from the name</span>
+<span id="L287" class="LineNr">287 </span>  <span class="Normal">const</span> string&amp; s = get<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L387'>Name</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L288" class="LineNr">288 </span>  <span class="Identifier">return</span> <span class="Constant">&quot; (&quot;</span>+s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> s<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot; (&quot;</span><span class="Delimiter">))</span>+<span class="Constant">')'</span><span class="Delimiter">;</span>
+<span id="L289" class="LineNr">289 </span><span class="Delimiter">}</span>
+<span id="L290" class="LineNr">290 </span>
+<span id="L291" class="LineNr">291 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L291'>compute_expected_operand_bitvector</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L292" class="LineNr">292 </span>  set&lt;string&gt; operands_found<span class="Delimiter">;</span>
+<span id="L293" class="LineNr">293 </span>  <span class="Normal">uint32_t</span> bitvector = <span class="Constant">0</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="Comment">/*</span><span class="Comment">skip op</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L295" class="LineNr">295 </span>    bitvector = bitvector | <a href='031check_operands.cc.html#L318'>expected_bit_for_received_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> operands_found<span class="Delimiter">,</span> inst<span class="Delimiter">);</span>
+<span id="L296" class="LineNr">296 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L238'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <a href='031check_operands.cc.html#L100'>INVALID_OPERANDS</a><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
+<span id="L297" class="LineNr">297 </span>  <span class="Delimiter">}</span>
+<span id="L298" class="LineNr">298 </span>  <span class="Identifier">return</span> bitvector<span class="Delimiter">;</span>
 <span id="L299" class="LineNr">299 </span><span class="Delimiter">}</span>
 <span id="L300" class="LineNr">300 </span>
-<span id="L301" class="LineNr">301 </span><span class="Normal">int</span> <a href='031check_operands.cc.html#L301'>first_operand</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L302" class="LineNr">302 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
-<span id="L303" class="LineNr">303 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f2&quot;</span> || inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L304" class="LineNr">304 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
-<span id="L305" class="LineNr">305 </span>      <span class="Identifier">return</span> <span class="Constant">3</span><span class="Delimiter">;</span>
-<span id="L306" class="LineNr">306 </span>    <span class="Normal">else</span>
-<span id="L307" class="LineNr">307 </span>      <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
-<span id="L308" class="LineNr">308 </span>  <span class="Delimiter">}</span>
-<span id="L309" class="LineNr">309 </span>  <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L310" class="LineNr">310 </span><span class="Delimiter">}</span>
-<span id="L311" class="LineNr">311 </span>
-<span id="L312" class="LineNr">312 </span><span class="Comment">// Scan the metadata of 'w' and return the expected bit corresponding to any operand type.</span>
-<span id="L313" class="LineNr">313 </span><span class="Comment">// Also raise an error if metadata contains multiple operand types.</span>
-<span id="L314" class="LineNr">314 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L314'>expected_bit_for_received_operand</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">,</span> set&lt;string&gt;&amp; instruction_operands<span class="Delimiter">,</span> <span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L315" class="LineNr">315 </span>  <span class="Normal">uint32_t</span> bv = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L316" class="LineNr">316 </span>  <span class="Normal">bool</span> found =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L317" class="LineNr">317 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L318" class="LineNr">318 </span>    string<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> curr = w<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L319" class="LineNr">319 </span>    string expected_metadata = curr<span class="Delimiter">;</span>
-<span id="L320" class="LineNr">320 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr == <span class="Constant">&quot;mod&quot;</span> || curr == <span class="Constant">&quot;rm32&quot;</span> || curr == <span class="Constant">&quot;r32&quot;</span> || curr == <span class="Constant">&quot;scale&quot;</span> || curr == <span class="Constant">&quot;index&quot;</span> || curr == <span class="Constant">&quot;base&quot;</span><span class="Delimiter">)</span>
-<span id="L321" class="LineNr">321 </span>      expected_metadata = <span class="Constant">&quot;modrm&quot;</span><span class="Delimiter">;</span>
-<span id="L322" class="LineNr">322 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L75'>Operand_type</a></span><span class="Delimiter">,</span> curr<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// ignore unrecognized metadata</span>
-<span id="L323" class="LineNr">323 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>found<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L324" class="LineNr">324 </span>      <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' has conflicting operand types; it should have only one\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L325" class="LineNr">325 </span>      <span class="Identifier">return</span> <a href='031check_operands.cc.html#L95'>INVALID_OPERANDS</a><span class="Delimiter">;</span>
-<span id="L326" class="LineNr">326 </span>    <span class="Delimiter">}</span>
-<span id="L327" class="LineNr">327 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>instruction_operands<span class="Delimiter">.</span>find<span class="Delimiter">(</span>curr<span class="Delimiter">)</span> != instruction_operands<span class="Delimiter">.</span>end<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L328" class="LineNr">328 </span>      <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': duplicate &quot;</span> &lt;&lt; curr &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L329" class="LineNr">329 </span>      <span class="Identifier">return</span> <a href='031check_operands.cc.html#L95'>INVALID_OPERANDS</a><span class="Delimiter">;</span>
+<span id="L301" class="LineNr">301 </span><span class="Normal">bool</span> <a href='031check_operands.cc.html#L301'>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="L302" class="LineNr">302 </span>  <span class="Identifier">return</span> <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">)</span> &gt; <a href='031check_operands.cc.html#L305'>first_operand</a><span class="Delimiter">(</span>inst<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="Normal">int</span> <a href='031check_operands.cc.html#L305'>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="L306" class="LineNr">306 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
+<span id="L307" class="LineNr">307 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f2&quot;</span> || inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L308" class="LineNr">308 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
+<span id="L309" class="LineNr">309 </span>      <span class="Identifier">return</span> <span class="Constant">3</span><span class="Delimiter">;</span>
+<span id="L310" class="LineNr">310 </span>    <span class="Normal">else</span>
+<span id="L311" class="LineNr">311 </span>      <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
+<span id="L312" class="LineNr">312 </span>  <span class="Delimiter">}</span>
+<span id="L313" class="LineNr">313 </span>  <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L314" class="LineNr">314 </span><span class="Delimiter">}</span>
+<span id="L315" class="LineNr">315 </span>
+<span id="L316" class="LineNr">316 </span><span class="Comment">// Scan the metadata of 'w' and return the expected bit corresponding to any operand type.</span>
+<span id="L317" class="LineNr">317 </span><span class="Comment">// Also raise an error if metadata contains multiple operand types.</span>
+<span id="L318" class="LineNr">318 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L318'>expected_bit_for_received_operand</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">,</span> set&lt;string&gt;&amp; instruction_operands<span class="Delimiter">,</span> <span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L319" class="LineNr">319 </span>  <span class="Normal">uint32_t</span> bv = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L320" class="LineNr">320 </span>  <span class="Normal">bool</span> found = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L321" class="LineNr">321 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L322" class="LineNr">322 </span>    string<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> curr = w<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L323" class="LineNr">323 </span>    string expected_metadata = curr<span class="Delimiter">;</span>
+<span id="L324" class="LineNr">324 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr == <span class="Constant">&quot;mod&quot;</span> || curr == <span class="Constant">&quot;rm32&quot;</span> || curr == <span class="Constant">&quot;r32&quot;</span> || curr == <span class="Constant">&quot;scale&quot;</span> || curr == <span class="Constant">&quot;index&quot;</span> || curr == <span class="Constant">&quot;base&quot;</span><span class="Delimiter">)</span>
+<span id="L325" class="LineNr">325 </span>      expected_metadata = <span class="Constant">&quot;modrm&quot;</span><span class="Delimiter">;</span>
+<span id="L326" class="LineNr">326 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L80'>Operand_type</a></span><span class="Delimiter">,</span> curr<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// ignore unrecognized metadata</span>
+<span id="L327" class="LineNr">327 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>found<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L328" class="LineNr">328 </span>      <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' has conflicting operand types; it should have only one\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L329" class="LineNr">329 </span>      <span class="Identifier">return</span> <a href='031check_operands.cc.html#L100'>INVALID_OPERANDS</a><span class="Delimiter">;</span>
 <span id="L330" class="LineNr">330 </span>    <span class="Delimiter">}</span>
-<span id="L331" class="LineNr">331 </span>    instruction_operands<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
-<span id="L332" class="LineNr">332 </span>    bv = <span class="Delimiter">(</span><span class="Constant">1</span> &lt;&lt; get<span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L75'>Operand_type</a></span><span class="Delimiter">,</span> expected_metadata<span class="Delimiter">));</span>
-<span id="L333" class="LineNr">333 </span>    found =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L334" class="LineNr">334 </span>  <span class="Delimiter">}</span>
-<span id="L335" class="LineNr">335 </span>  <span class="Identifier">return</span> bv<span class="Delimiter">;</span>
-<span id="L336" class="LineNr">336 </span><span class="Delimiter">}</span>
-<span id="L337" class="LineNr">337 </span>
-<span id="L338" class="LineNr">338 </span><span class="Delimiter">:(scenario conflicting_operand_type)</span>
-<span id="L339" class="LineNr">339 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L340" class="LineNr">340 </span>== <span class="Constant">0x1</span>
-<span id="L341" class="LineNr">341 </span>cd/software-interrupt <span class="Constant">80</span>/imm8/imm32
-<span id="L342" class="LineNr">342 </span><span class="traceContains">+error: '80/imm8/imm32' has conflicting operand types; it should have only one</span>
-<span id="L343" class="LineNr">343 </span>
-<span id="L344" class="LineNr">344 </span><span class="Comment">//: Instructions computing effective addresses have more complex rules, so</span>
-<span id="L345" class="LineNr">345 </span><span class="Comment">//: we'll hard-code a common set of instruction-decoding rules.</span>
-<span id="L346" class="LineNr">346 </span>
-<span id="L347" class="LineNr">347 </span><span class="Delimiter">:(scenario check_missing_mod_operand)</span>
-<span id="L348" class="LineNr">348 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L349" class="LineNr">349 </span>== <span class="Constant">0x1</span>
-<span id="L350" class="LineNr">350 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop       <span class="Constant">3</span>/rm32/ebx <span class="Constant">1</span>/imm32
-<span id="L351" class="LineNr">351 </span><span class="traceContains">+error: '81 0/add/subop 3/rm32/ebx 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing mod operand</span>
+<span id="L331" class="LineNr">331 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>instruction_operands<span class="Delimiter">.</span>find<span class="Delimiter">(</span>curr<span class="Delimiter">)</span> != instruction_operands<span class="Delimiter">.</span>end<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L332" class="LineNr">332 </span>      <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': duplicate &quot;</span> &lt;&lt; curr &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L333" class="LineNr">333 </span>      <span class="Identifier">return</span> <a href='031check_operands.cc.html#L100'>INVALID_OPERANDS</a><span class="Delimiter">;</span>
+<span id="L334" class="LineNr">334 </span>    <span class="Delimiter">}</span>
+<span id="L335" class="LineNr">335 </span>    instruction_operands<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
+<span id="L336" class="LineNr">336 </span>    bv = <span class="Delimiter">(</span><span class="Constant">1</span> &lt;&lt; get<span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L80'>Operand_type</a></span><span class="Delimiter">,</span> expected_metadata<span class="Delimiter">));</span>
+<span id="L337" class="LineNr">337 </span>    found = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L338" class="LineNr">338 </span>  <span class="Delimiter">}</span>
+<span id="L339" class="LineNr">339 </span>  <span class="Identifier">return</span> bv<span class="Delimiter">;</span>
+<span id="L340" class="LineNr">340 </span><span class="Delimiter">}</span>
+<span id="L341" class="LineNr">341 </span>
+<span id="L342" class="LineNr">342 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L342'>test_conflicting_operand_type</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L343" class="LineNr">343 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L344" class="LineNr">344 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L345" class="LineNr">345 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L346" class="LineNr">346 </span>      <span class="Constant">&quot;cd/software-interrupt 80/imm8/imm32\n&quot;</span>
+<span id="L347" class="LineNr">347 </span>  <span class="Delimiter">);</span>
+<span id="L348" class="LineNr">348 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L349" class="LineNr">349 </span>      <span class="Constant">&quot;error: '80/imm8/imm32' has conflicting operand types; it should have only one\n&quot;</span>
+<span id="L350" class="LineNr">350 </span>  <span class="Delimiter">);</span>
+<span id="L351" class="LineNr">351 </span><span class="Delimiter">}</span>
 <span id="L352" class="LineNr">352 </span>
-<span id="L353" class="LineNr">353 </span><span class="Delimiter">:(code)</span>
-<span id="L354" class="LineNr">354 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L354'>check_operands_modrm</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L355" class="LineNr">355 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
-<span id="L356" class="LineNr">356 </span>  <a href='031check_operands.cc.html#L414'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L357" class="LineNr">357 </span>  <a href='031check_operands.cc.html#L414'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L358" class="LineNr">358 </span>  <span class="Comment">// no check for r32; some instructions don't use it; just assume it's 0 if missing</span>
-<span id="L359" class="LineNr">359 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span>data == <span class="Constant">&quot;81&quot;</span> || op<span class="Delimiter">.</span>data == <span class="Constant">&quot;8f&quot;</span> || op<span class="Delimiter">.</span>data == <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>  <span class="Comment">// keep sync'd with 'help subop'</span>
-<span id="L360" class="LineNr">360 </span>    <a href='031check_operands.cc.html#L414'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;subop&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L361" class="LineNr">361 </span>    <a href='031check_operands.cc.html#L419'>check_operand_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;r32&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;should be replaced by subop&quot;</span><span class="Delimiter">);</span>
-<span id="L362" class="LineNr">362 </span>  <span class="Delimiter">}</span>
-<span id="L363" class="LineNr">363 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L230'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L364" class="LineNr">364 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">).</span>data != <span class="Constant">&quot;4&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L365" class="LineNr">365 </span>  <span class="Comment">// SIB byte checks</span>
-<span id="L366" class="LineNr">366 </span>  <span class="Normal">uint8_t</span> mod = <a href='011run.cc.html#L266'>hex_byte</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span>
-<span id="L367" class="LineNr">367 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>mod != <span class="Comment">/*</span><span class="Comment">direct</span><span class="Comment">*/</span><span class="Constant">3</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L368" class="LineNr">368 </span>    <a href='031check_operands.cc.html#L414'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L369" class="LineNr">369 </span>    <a href='031check_operands.cc.html#L414'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>  <span class="Comment">// otherwise why go to SIB?</span>
-<span id="L370" class="LineNr">370 </span>  <span class="Delimiter">}</span>
-<span id="L371" class="LineNr">371 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L372" class="LineNr">372 </span>    <a href='031check_operands.cc.html#L419'>check_operand_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;direct mode&quot;</span><span class="Delimiter">);</span>
-<span id="L373" class="LineNr">373 </span>    <a href='031check_operands.cc.html#L419'>check_operand_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;direct mode&quot;</span><span class="Delimiter">);</span>
-<span id="L374" class="LineNr">374 </span>  <span class="Delimiter">}</span>
-<span id="L375" class="LineNr">375 </span>  <span class="Comment">// no check for scale; 0 (2**0 = 1) by default</span>
-<span id="L376" class="LineNr">376 </span><span class="Delimiter">}</span>
-<span id="L377" class="LineNr">377 </span>
-<span id="L378" class="LineNr">378 </span><span class="Comment">// same as compare_bitvector, with one additional exception for modrm-based</span>
-<span id="L379" class="LineNr">379 </span><span class="Comment">// instructions: they may use an extra displacement on occasion</span>
-<span id="L380" class="LineNr">380 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L380'>compare_bitvector_modrm</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L381" class="LineNr">381 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L297'>has_operands</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
-<span id="L382" class="LineNr">382 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L287'>compute_expected_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L383" class="LineNr">383 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L230'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
-<span id="L384" class="LineNr">384 </span>  <span class="Comment">// update 'expected' bitvector for the additional exception</span>
-<span id="L385" class="LineNr">385 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L386" class="LineNr">386 </span>    <span class="Normal">int32_t</span> mod = <a href='011run.cc.html#L355'>parse_int</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span>
-<span id="L387" class="LineNr">387 </span>    <span class="Normal">switch</span> <span class="Delimiter">(</span>mod<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L388" class="LineNr">388 </span>    <span class="Normal">case</span> <span class="Constant">0</span>:
-<span id="L389" class="LineNr">389 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">)</span> &amp;&amp; <a href='011run.cc.html#L355'>parse_int</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">).</span>data<span class="Delimiter">)</span> == <span class="Constant">5</span><span class="Delimiter">)</span>
-<span id="L390" class="LineNr">390 </span>        expected |= <span class="Delimiter">(</span><span class="Constant">1</span>&lt;&lt;DISP32<span class="Delimiter">);</span>
-<span id="L391" class="LineNr">391 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L392" class="LineNr">392 </span>    <span class="Normal">case</span> <span class="Constant">1</span>:
-<span id="L393" class="LineNr">393 </span>      expected |= <span class="Delimiter">(</span><span class="Constant">1</span>&lt;&lt;DISP8<span class="Delimiter">);</span>
-<span id="L394" class="LineNr">394 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L395" class="LineNr">395 </span>    <span class="Normal">case</span> <span class="Constant">2</span>:
-<span id="L396" class="LineNr">396 </span>      expected |= <span class="Delimiter">(</span><span class="Constant">1</span>&lt;&lt;DISP32<span class="Delimiter">);</span>
-<span id="L397" class="LineNr">397 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L398" class="LineNr">398 </span>    <span class="Delimiter">}</span>
-<span id="L399" class="LineNr">399 </span>  <span class="Delimiter">}</span>
-<span id="L400" class="LineNr">400 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>bitvector == expected<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this instruction</span>
-<span id="L401" class="LineNr">401 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L71'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L402" class="LineNr">402 </span><span class="CommentedCode">//?     cerr &lt;&lt; &quot;comparing for modrm &quot; &lt;&lt; HEXBYTE &lt;&lt; NUM(bitvector) &lt;&lt; &quot; with &quot; &lt;&lt; NUM(expected) &lt;&lt; '\n';</span>
-<span id="L403" class="LineNr">403 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> == <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this operand</span>
-<span id="L404" class="LineNr">404 </span>    <span class="Normal">const</span> string&amp; optype = <span class="Special"><a href='031check_operands.cc.html#L74'>Operand_type_name</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L405" class="LineNr">405 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> &gt; <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span>
-<span id="L406" class="LineNr">406 </span>      <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L279'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L407" class="LineNr">407 </span>    <span class="Normal">else</span>
-<span id="L408" class="LineNr">408 </span>      <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L279'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L409" class="LineNr">409 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
-<span id="L410" class="LineNr">410 </span>  <span class="Delimiter">}</span>
-<span id="L411" class="LineNr">411 </span>  <span class="Comment">// ignore settings in any unused bits</span>
-<span id="L412" class="LineNr">412 </span><span class="Delimiter">}</span>
-<span id="L413" class="LineNr">413 </span>
-<span id="L414" class="LineNr">414 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L414'>check_operand_metadata_present</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; type<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L415" class="LineNr">415 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> type<span class="Delimiter">))</span>
-<span id="L416" class="LineNr">416 </span>    <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L279'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; type &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L417" class="LineNr">417 </span><span class="Delimiter">}</span>
-<span id="L418" class="LineNr">418 </span>
-<span id="L419" class="LineNr">419 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L419'>check_operand_metadata_absent</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; type<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; msg<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L420" class="LineNr">420 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> type<span class="Delimiter">))</span>
-<span id="L421" class="LineNr">421 </span>    <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L279'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; type &lt;&lt; <span class="Constant">&quot; operand (&quot;</span> &lt;&lt; msg &lt;&lt; <span class="Constant">&quot;)\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L422" class="LineNr">422 </span><span class="Delimiter">}</span>
-<span id="L423" class="LineNr">423 </span>
-<span id="L424" class="LineNr">424 </span><span class="Delimiter">:(scenarios transform)</span>
-<span id="L425" class="LineNr">425 </span><span class="Delimiter">:(scenario modrm_with_displacement)</span>
-<span id="L426" class="LineNr">426 </span><span class="Special">% Reg[EAX].u = 0x1;</span>
-<span id="L427" class="LineNr">427 </span>== <span class="Constant">0x1</span>
-<span id="L428" class="LineNr">428 </span><span class="Comment"># just avoid null pointer</span>
-<span id="L429" class="LineNr">429 </span>8b/copy <span class="Constant">1</span>/mod/lookup+disp8 <span class="Constant">0</span>/rm32/EAX <span class="Constant">2</span>/r32/EDX <span class="Constant">4</span>/disp8  <span class="Comment"># copy *(EAX+4) to EDX</span>
-<span id="L430" class="LineNr">430 </span>$error: <span class="Constant">0</span>
+<span id="L353" class="LineNr">353 </span><span class="Comment">//: Instructions computing effective addresses have more complex rules, so</span>
+<span id="L354" class="LineNr">354 </span><span class="Comment">//: we'll hard-code a common set of instruction-decoding rules.</span>
+<span id="L355" class="LineNr">355 </span>
+<span id="L356" class="LineNr">356 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L356'>test_check_missing_mod_operand</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L357" class="LineNr">357 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L358" class="LineNr">358 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L359" class="LineNr">359 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L360" class="LineNr">360 </span>      <span class="Constant">&quot;81 0/add/subop       3/rm32/ebx 1/imm32\n&quot;</span>
+<span id="L361" class="LineNr">361 </span>  <span class="Delimiter">);</span>
+<span id="L362" class="LineNr">362 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L363" class="LineNr">363 </span>      <span class="Constant">&quot;error: '81 0/add/subop 3/rm32/ebx 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing mod operand\n&quot;</span>
+<span id="L364" class="LineNr">364 </span>  <span class="Delimiter">);</span>
+<span id="L365" class="LineNr">365 </span><span class="Delimiter">}</span>
+<span id="L366" class="LineNr">366 </span>
+<span id="L367" class="LineNr">367 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L367'>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="L368" class="LineNr">368 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L416'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
+<span id="L369" class="LineNr">369 </span>  <a href='031check_operands.cc.html#L427'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L370" class="LineNr">370 </span>  <a href='031check_operands.cc.html#L427'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L371" class="LineNr">371 </span>  <span class="Comment">// no check for r32; some instructions don't use it; just assume it's 0 if missing</span>
+<span id="L372" class="LineNr">372 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span>data == <span class="Constant">&quot;81&quot;</span> || op<span class="Delimiter">.</span>data == <span class="Constant">&quot;8f&quot;</span> || op<span class="Delimiter">.</span>data == <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>  <span class="Comment">// keep sync'd with 'help subop'</span>
+<span id="L373" class="LineNr">373 </span>    <a href='031check_operands.cc.html#L427'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;subop&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L374" class="LineNr">374 </span>    <a href='031check_operands.cc.html#L432'>check_operand_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;r32&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;should be replaced by subop&quot;</span><span class="Delimiter">);</span>
+<span id="L375" class="LineNr">375 </span>  <span class="Delimiter">}</span>
+<span id="L376" class="LineNr">376 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L238'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L377" class="LineNr">377 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">).</span>data != <span class="Constant">&quot;4&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L378" class="LineNr">378 </span>  <span class="Comment">// SIB byte checks</span>
+<span id="L379" class="LineNr">379 </span>  <span class="Normal">uint8_t</span> mod = <a href='011run.cc.html#L277'>hex_byte</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span>
+<span id="L380" class="LineNr">380 </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="L381" class="LineNr">381 </span>    <a href='031check_operands.cc.html#L427'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L382" class="LineNr">382 </span>    <a href='031check_operands.cc.html#L427'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>  <span class="Comment">// otherwise why go to SIB?</span>
+<span id="L383" class="LineNr">383 </span>  <span class="Delimiter">}</span>
+<span id="L384" class="LineNr">384 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L385" class="LineNr">385 </span>    <a href='031check_operands.cc.html#L432'>check_operand_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;direct mode&quot;</span><span class="Delimiter">);</span>
+<span id="L386" class="LineNr">386 </span>    <a href='031check_operands.cc.html#L432'>check_operand_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;direct mode&quot;</span><span class="Delimiter">);</span>
+<span id="L387" class="LineNr">387 </span>  <span class="Delimiter">}</span>
+<span id="L388" class="LineNr">388 </span>  <span class="Comment">// no check for scale; 0 (2**0 = 1) by default</span>
+<span id="L389" class="LineNr">389 </span><span class="Delimiter">}</span>
+<span id="L390" class="LineNr">390 </span>
+<span id="L391" class="LineNr">391 </span><span class="Comment">// same as compare_bitvector, with one additional exception for modrm-based</span>
+<span id="L392" class="LineNr">392 </span><span class="Comment">// instructions: they may use an extra displacement on occasion</span>
+<span id="L393" class="LineNr">393 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L393'>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="L394" class="LineNr">394 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L416'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L301'>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="L395" class="LineNr">395 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L291'>compute_expected_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L396" class="LineNr">396 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L238'>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="L397" class="LineNr">397 </span>  <span class="Comment">// update 'expected' bitvector for the additional exception</span>
+<span id="L398" class="LineNr">398 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L399" class="LineNr">399 </span>    <span class="Normal">int32_t</span> mod = <a href='011run.cc.html#L382'>parse_int</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span>
+<span id="L400" class="LineNr">400 </span>    <span class="Normal">switch</span> <span class="Delimiter">(</span>mod<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L401" class="LineNr">401 </span>    <span class="Normal">case</span> <span class="Constant">0</span>:
+<span id="L402" class="LineNr">402 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">)</span> &amp;&amp; <a href='011run.cc.html#L382'>parse_int</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">).</span>data<span class="Delimiter">)</span> == <span class="Constant">5</span><span class="Delimiter">)</span>
+<span id="L403" class="LineNr">403 </span>        expected |= <span class="Delimiter">(</span><span class="Constant">1</span>&lt;&lt;DISP32<span class="Delimiter">);</span>
+<span id="L404" class="LineNr">404 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L405" class="LineNr">405 </span>    <span class="Normal">case</span> <span class="Constant">1</span>:
+<span id="L406" class="LineNr">406 </span>      expected |= <span class="Delimiter">(</span><span class="Constant">1</span>&lt;&lt;DISP8<span class="Delimiter">);</span>
+<span id="L407" class="LineNr">407 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L408" class="LineNr">408 </span>    <span class="Normal">case</span> <span class="Constant">2</span>:
+<span id="L409" class="LineNr">409 </span>      expected |= <span class="Delimiter">(</span><span class="Constant">1</span>&lt;&lt;DISP32<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 class="Delimiter">}</span>
+<span id="L413" class="LineNr">413 </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="L414" class="LineNr">414 </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#L76'>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="L415" class="LineNr">415 </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="L416" class="LineNr">416 </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="L417" class="LineNr">417 </span>    <span class="Normal">const</span> string&amp; optype = <span class="Special"><a href='031check_operands.cc.html#L79'>Operand_type_name</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L418" class="LineNr">418 </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="L419" class="LineNr">419 </span>      <a href='003trace.cc.html#L202'>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#L283'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L420" class="LineNr">420 </span>    <span class="Normal">else</span>
+<span id="L421" class="LineNr">421 </span>      <a href='003trace.cc.html#L202'>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#L283'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L422" class="LineNr">422 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
+<span id="L423" class="LineNr">423 </span>  <span class="Delimiter">}</span>
+<span id="L424" class="LineNr">424 </span>  <span class="Comment">// ignore settings in any unused bits</span>
+<span id="L425" class="LineNr">425 </span><span class="Delimiter">}</span>
+<span id="L426" class="LineNr">426 </span>
+<span id="L427" class="LineNr">427 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L427'>check_operand_metadata_present</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; type<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L428" class="LineNr">428 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> type<span class="Delimiter">))</span>
+<span id="L429" class="LineNr">429 </span>    <a href='003trace.cc.html#L202'>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#L283'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; type &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="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="Delimiter">:(scenario check_missing_disp8)</span>
-<span id="L433" class="LineNr">433 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L434" class="LineNr">434 </span>== <span class="Constant">0x1</span>
-<span id="L435" class="LineNr">435 </span><span class="Constant">89</span>/copy <span class="Constant">1</span>/mod/lookup+disp8 <span class="Constant">0</span>/rm32/EAX <span class="Constant">1</span>/r32/ECX  <span class="Comment"># missing disp8</span>
-<span id="L436" class="LineNr">436 </span><span class="traceContains">+error: '89/copy 1/mod/lookup+disp8 0/rm32/EAX 1/r32/ECX' (copy r32 to rm32): missing disp8 operand</span>
-<span id="L437" class="LineNr">437 </span>
-<span id="L438" class="LineNr">438 </span><span class="Delimiter">:(scenario check_missing_disp32)</span>
-<span id="L439" class="LineNr">439 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L440" class="LineNr">440 </span>== <span class="Constant">0x1</span>
-<span id="L441" class="LineNr">441 </span>8b/copy <span class="Constant">0</span>/mod/indirect <span class="Constant">5</span>/rm32/<span class="Delimiter">.</span>disp32 <span class="Constant">2</span>/r32/EDX  <span class="Comment"># missing disp32</span>
-<span id="L442" class="LineNr">442 </span><span class="traceContains">+error: '8b/copy 0/mod/indirect 5/rm32/.disp32 2/r32/EDX' (copy rm32 to r32): missing disp32 operand</span>
-<span id="L443" class="LineNr">443 </span><span class="Delimiter">:(scenarios run)</span>
-<span id="L444" class="LineNr">444 </span>
-<span id="L445" class="LineNr">445 </span><span class="Delimiter">:(scenario conflicting_operands_in_modrm_instruction)</span>
-<span id="L446" class="LineNr">446 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L447" class="LineNr">447 </span>== <span class="Constant">0x1</span>
-<span id="L448" class="LineNr">448 </span><span class="PreProc">0</span><span class="Constant">1</span>/add <span class="Constant">0</span>/mod <span class="Constant">3</span>/mod
-<span id="L449" class="LineNr">449 </span><span class="traceContains">+error: '01/add 0/mod 3/mod' has conflicting mod operands</span>
-<span id="L450" class="LineNr">450 </span>
-<span id="L451" class="LineNr">451 </span><span class="Delimiter">:(scenario conflicting_operand_type_modrm)</span>
-<span id="L452" class="LineNr">452 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L453" class="LineNr">453 </span>== <span class="Constant">0x1</span>
-<span id="L454" class="LineNr">454 </span><span class="PreProc">0</span><span class="Constant">1</span>/add <span class="Constant">0</span>/mod <span class="Constant">3</span>/rm32/r32
-<span id="L455" class="LineNr">455 </span><span class="traceContains">+error: '3/rm32/r32' has conflicting operand types; it should have only one</span>
-<span id="L456" class="LineNr">456 </span>
-<span id="L457" class="LineNr">457 </span><span class="Delimiter">:(scenario check_missing_rm32_operand)</span>
-<span id="L458" class="LineNr">458 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L459" class="LineNr">459 </span>== <span class="Constant">0x1</span>
-<span id="L460" class="LineNr">460 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod            <span class="Constant">1</span>/imm32
-<span id="L461" class="LineNr">461 </span><span class="traceContains">+error: '81 0/add/subop 0/mod 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing rm32 operand</span>
-<span id="L462" class="LineNr">462 </span>
-<span id="L463" class="LineNr">463 </span><span class="Delimiter">:(scenario check_missing_subop_operand)</span>
-<span id="L464" class="LineNr">464 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L465" class="LineNr">465 </span>== <span class="Constant">0x1</span>
-<span id="L466" class="LineNr">466 </span><span class="Constant">81</span>             <span class="Constant">0</span>/mod <span class="Constant">3</span>/rm32/ebx <span class="Constant">1</span>/imm32
-<span id="L467" class="LineNr">467 </span><span class="traceContains">+error: '81 0/mod 3/rm32/ebx 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing subop operand</span>
+<span id="L432" class="LineNr">432 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L432'>check_operand_metadata_absent</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; type<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; msg<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L433" class="LineNr">433 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> type<span class="Delimiter">))</span>
+<span id="L434" class="LineNr">434 </span>    <a href='003trace.cc.html#L202'>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#L283'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; type &lt;&lt; <span class="Constant">&quot; operand (&quot;</span> &lt;&lt; msg &lt;&lt; <span class="Constant">&quot;)\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L435" class="LineNr">435 </span><span class="Delimiter">}</span>
+<span id="L436" class="LineNr">436 </span>
+<span id="L437" class="LineNr">437 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L437'>test_modrm_with_displacement</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L438" class="LineNr">438 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>u = <span class="Constant">0x1</span><span class="Delimiter">;</span>
+<span id="L439" class="LineNr">439 </span>  transform<span class="Delimiter">(</span>
+<span id="L440" class="LineNr">440 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>
+<span id="L441" class="LineNr">441 </span>      <span class="Comment">// just avoid null pointer</span>
+<span id="L442" class="LineNr">442 </span>      <span class="Constant">&quot;8b/copy 1/mod/lookup+disp8 0/rm32/EAX 2/r32/EDX 4/disp8\n&quot;</span>  <span class="Comment">// copy *(EAX+4) to EDX</span>
+<span id="L443" class="LineNr">443 </span>  <span class="Delimiter">);</span>
+<span id="L444" class="LineNr">444 </span>  <a href='003trace.cc.html#L270'>CHECK_TRACE_COUNT</a><span class="Delimiter">(</span><span class="Constant">&quot;error&quot;</span><span class="Delimiter">,</span> <span class="Constant">0</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="Normal">void</span> <a href='031check_operands.cc.html#L447'>test_check_missing_disp8</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L448" class="LineNr">448 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L449" class="LineNr">449 </span>  transform<span class="Delimiter">(</span>
+<span id="L450" class="LineNr">450 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L451" class="LineNr">451 </span>      <span class="Constant">&quot;89/copy 1/mod/lookup+disp8 0/rm32/EAX 1/r32/ECX\n&quot;</span>  <span class="Comment">// missing disp8</span>
+<span id="L452" class="LineNr">452 </span>  <span class="Delimiter">);</span>
+<span id="L453" class="LineNr">453 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L454" class="LineNr">454 </span>      <span class="Constant">&quot;error: '89/copy 1/mod/lookup+disp8 0/rm32/EAX 1/r32/ECX' (copy r32 to rm32): missing disp8 operand\n&quot;</span>
+<span id="L455" class="LineNr">455 </span>  <span class="Delimiter">);</span>
+<span id="L456" class="LineNr">456 </span><span class="Delimiter">}</span>
+<span id="L457" class="LineNr">457 </span>
+<span id="L458" class="LineNr">458 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L458'>test_check_missing_disp32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L459" class="LineNr">459 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L460" class="LineNr">460 </span>  transform<span class="Delimiter">(</span>
+<span id="L461" class="LineNr">461 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L462" class="LineNr">462 </span>      <span class="Constant">&quot;8b/copy 0/mod/indirect 5/rm32/.disp32 2/r32/EDX\n&quot;</span>  <span class="Comment">// missing disp32</span>
+<span id="L463" class="LineNr">463 </span>  <span class="Delimiter">);</span>
+<span id="L464" class="LineNr">464 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L465" class="LineNr">465 </span>      <span class="Constant">&quot;error: '8b/copy 0/mod/indirect 5/rm32/.disp32 2/r32/EDX' (copy rm32 to r32): missing <a href='040---tests.cc.html#L83'>disp32</a> operand\n&quot;</span>
+<span id="L466" class="LineNr">466 </span>  <span class="Delimiter">);</span>
+<span id="L467" class="LineNr">467 </span><span class="Delimiter">}</span>
 <span id="L468" class="LineNr">468 </span>
-<span id="L469" class="LineNr">469 </span><span class="Delimiter">:(scenario check_missing_base_operand)</span>
-<span id="L470" class="LineNr">470 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L471" class="LineNr">471 </span>== <span class="Constant">0x1</span>
-<span id="L472" class="LineNr">472 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">1</span>/imm32
-<span id="L473" class="LineNr">473 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing base operand</span>
-<span id="L474" class="LineNr">474 </span>
-<span id="L475" class="LineNr">475 </span><span class="Delimiter">:(scenario check_missing_index_operand)</span>
-<span id="L476" class="LineNr">476 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L477" class="LineNr">477 </span>== <span class="Constant">0x1</span>
-<span id="L478" class="LineNr">478 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">0</span>/base <span class="Constant">1</span>/imm32
-<span id="L479" class="LineNr">479 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 0/base 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing index operand</span>
-<span id="L480" class="LineNr">480 </span>
-<span id="L481" class="LineNr">481 </span><span class="Delimiter">:(scenario check_missing_base_operand_2)</span>
-<span id="L482" class="LineNr">482 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L483" class="LineNr">483 </span>== <span class="Constant">0x1</span>
-<span id="L484" class="LineNr">484 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">2</span>/index <span class="Constant">3</span>/scale <span class="Constant">1</span>/imm32
-<span id="L485" class="LineNr">485 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 2/index 3/scale 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing base operand</span>
-<span id="L486" class="LineNr">486 </span>
-<span id="L487" class="LineNr">487 </span><span class="Delimiter">:(scenario check_extra_displacement)</span>
-<span id="L488" class="LineNr">488 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L489" class="LineNr">489 </span>== <span class="Constant">0x1</span>
-<span id="L490" class="LineNr">490 </span><span class="Constant">89</span>/copy <span class="Constant">0</span>/mod/indirect <span class="Constant">0</span>/rm32/EAX <span class="Constant">1</span>/r32/ECX <span class="Constant">4</span>/disp8
-<span id="L491" class="LineNr">491 </span><span class="traceContains">+error: '89/copy 0/mod/indirect 0/rm32/EAX 1/r32/ECX 4/disp8' (copy r32 to rm32): unexpected disp8 operand</span>
-<span id="L492" class="LineNr">492 </span>
-<span id="L493" class="LineNr">493 </span><span class="Delimiter">:(scenario check_duplicate_operand)</span>
-<span id="L494" class="LineNr">494 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L495" class="LineNr">495 </span>== <span class="Constant">0x1</span>
-<span id="L496" class="LineNr">496 </span><span class="Constant">89</span>/copy <span class="Constant">0</span>/mod/indirect <span class="Constant">0</span>/rm32/EAX <span class="Constant">1</span>/r32/ECX <span class="Constant">1</span>/r32
-<span id="L497" class="LineNr">497 </span><span class="traceContains">+error: '89/copy 0/mod/indirect 0/rm32/EAX 1/r32/ECX 1/r32': duplicate r32 operand</span>
-<span id="L498" class="LineNr">498 </span>
-<span id="L499" class="LineNr">499 </span><span class="Delimiter">:(scenario check_base_operand_not_needed_in_direct_mode)</span>
-<span id="L500" class="LineNr">500 </span>== <span class="Constant">0x1</span>
-<span id="L501" class="LineNr">501 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">3</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">1</span>/imm32
-<span id="L502" class="LineNr">502 </span>$error: <span class="Constant">0</span>
-<span id="L503" class="LineNr">503 </span>
-<span id="L504" class="LineNr">504 </span><span class="Delimiter">:(scenario extra_modrm)</span>
-<span id="L505" class="LineNr">505 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L506" class="LineNr">506 </span>== <span class="Constant">0x1</span>
-<span id="L507" class="LineNr">507 </span><span class="Constant">59</span>/pop-to-ECX  <span class="Constant">3</span>/mod/direct <span class="Constant">1</span>/rm32/ECX <span class="Constant">4</span>/r32/ESP
-<span id="L508" class="LineNr">508 </span><span class="traceContains">+error: '59/pop-to-ECX 3/mod/direct 1/rm32/ECX 4/r32/ESP' (pop top of stack to ECX): unexpected modrm operand</span>
-<span id="L509" class="LineNr">509 </span>
-<span id="L510" class="LineNr">510 </span><span class="SalientComment">//:: similarly handle multi-byte opcodes</span>
-<span id="L511" class="LineNr">511 </span>
-<span id="L512" class="LineNr">512 </span><span class="Delimiter">:(code)</span>
-<span id="L513" class="LineNr">513 </span><span class="Normal">void</span> check_operands_0f<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L514" class="LineNr">514 </span>  assert<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">);</span>
-<span id="L515" class="LineNr">515 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L516" class="LineNr">516 </span>    <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;opcode '0f' requires a second opcode\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L517" class="LineNr">517 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L518" class="LineNr">518 </span>  <span class="Delimiter">}</span>
-<span id="L519" class="LineNr">519 </span>  <a href='011run.cc.html#L119'>word</a> op = <a href='031check_operands.cc.html#L36'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
-<span id="L520" class="LineNr">520 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L381'>Name_0f</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L521" class="LineNr">521 </span>    <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;unknown 2-byte opcode '0f &quot;</span> &lt;&lt; op<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L522" class="LineNr">522 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L523" class="LineNr">523 </span>  <span class="Delimiter">}</span>
-<span id="L524" class="LineNr">524 </span>  check_operands_0f<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L525" class="LineNr">525 </span><span class="Delimiter">}</span>
-<span id="L526" class="LineNr">526 </span>
-<span id="L527" class="LineNr">527 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L527'>check_operands_f3</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L528" class="LineNr">528 </span>  <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;no supported opcodes starting with f3\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L529" class="LineNr">529 </span><span class="Delimiter">}</span>
-<span id="L530" class="LineNr">530 </span>
-<span id="L531" class="LineNr">531 </span><span class="Delimiter">:(scenario check_missing_disp32_operand)</span>
-<span id="L532" class="LineNr">532 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L533" class="LineNr">533 </span>== <span class="Constant">0x1</span>
-<span id="L534" class="LineNr">534 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L535" class="LineNr">535 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L536" class="LineNr">536 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
-<span id="L537" class="LineNr">537 </span>  <span class="Constant">0f</span> <span class="Constant">84</span>                                                                                                                                             <span class="Comment"># jmp if ZF to ??</span>
-<span id="L538" class="LineNr">538 </span><span class="traceContains">+error: '0f 84' (jump disp32 bytes away if equal, if ZF is set): missing disp32 operand</span>
-<span id="L539" class="LineNr">539 </span>
-<span id="L540" class="LineNr">540 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L541" class="LineNr">541 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">bitvector</span><span class="Comment">*/</span><span class="Normal">uint8_t</span>&gt; <span class="Special"><a href='031check_operands.cc.html#L541'>Permitted_operands_0f</a></span><span class="Delimiter">;</span>
-<span id="L542" class="LineNr">542 </span><span class="Delimiter">:(before &quot;End Init Permitted Operands&quot;)</span>
-<span id="L543" class="LineNr">543 </span><span class="SalientComment">//// Class D: just op and disp32</span>
-<span id="L544" class="LineNr">544 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L545" class="LineNr">545 </span><span class="Comment">//  0     0     1      |0       0     0     0</span>
-<span id="L546" class="LineNr">546 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L541'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;84&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
-<span id="L547" class="LineNr">547 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L541'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;85&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
-<span id="L548" class="LineNr">548 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L541'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
-<span id="L549" class="LineNr">549 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L541'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
-<span id="L550" class="LineNr">550 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L541'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
-<span id="L551" class="LineNr">551 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L541'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
-<span id="L552" class="LineNr">552 </span>
-<span id="L553" class="LineNr">553 </span><span class="SalientComment">//// Class M: using ModR/M byte</span>
-<span id="L554" class="LineNr">554 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L555" class="LineNr">555 </span><span class="Comment">//  0     0     0      |0       0     0     1</span>
-<span id="L556" class="LineNr">556 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L541'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;af&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L557" class="LineNr">557 </span>
-<span id="L558" class="LineNr">558 </span><span class="Delimiter">:(code)</span>
-<span id="L559" class="LineNr">559 </span><span class="Normal">void</span> check_operands_0f<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L560" class="LineNr">560 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L541'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L561" class="LineNr">561 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>HAS<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L64'>MODRM</a><span class="Delimiter">))</span>
-<span id="L562" class="LineNr">562 </span>    <a href='031check_operands.cc.html#L354'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L563" class="LineNr">563 </span>  <a href='031check_operands.cc.html#L566'>compare_bitvector_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> CLEAR<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L64'>MODRM</a><span class="Delimiter">),</span> op<span class="Delimiter">);</span>
-<span id="L564" class="LineNr">564 </span><span class="Delimiter">}</span>
-<span id="L565" class="LineNr">565 </span>
-<span id="L566" class="LineNr">566 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L566'>compare_bitvector_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L567" class="LineNr">567 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L297'>has_operands</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
-<span id="L568" class="LineNr">568 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L287'>compute_expected_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L569" class="LineNr">569 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L230'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
-<span id="L570" class="LineNr">570 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>bitvector == expected<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this instruction</span>
-<span id="L571" class="LineNr">571 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L71'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L572" class="LineNr">572 </span><span class="CommentedCode">//?     cerr &lt;&lt; &quot;comparing &quot; &lt;&lt; HEXBYTE &lt;&lt; NUM(bitvector) &lt;&lt; &quot; with &quot; &lt;&lt; NUM(expected) &lt;&lt; '\n';</span>
-<span id="L573" class="LineNr">573 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> == <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this operand</span>
-<span id="L574" class="LineNr">574 </span>    <span class="Normal">const</span> string&amp; optype = <span class="Special"><a href='031check_operands.cc.html#L74'>Operand_type_name</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L575" class="LineNr">575 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> &gt; <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span>
-<span id="L576" class="LineNr">576 </span>      <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L584'>maybe_name_0f</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L577" class="LineNr">577 </span>    <span class="Normal">else</span>
-<span id="L578" class="LineNr">578 </span>      <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L584'>maybe_name_0f</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L579" class="LineNr">579 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
-<span id="L580" class="LineNr">580 </span>  <span class="Delimiter">}</span>
-<span id="L581" class="LineNr">581 </span>  <span class="Comment">// ignore settings in any unused bits</span>
-<span id="L582" class="LineNr">582 </span><span class="Delimiter">}</span>
-<span id="L583" class="LineNr">583 </span>
-<span id="L584" class="LineNr">584 </span>string <a href='031check_operands.cc.html#L584'>maybe_name_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L585" class="LineNr">585 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>op<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L586" class="LineNr">586 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L381'>Name_0f</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L587" class="LineNr">587 </span>  <span class="Comment">// strip stuff in parens from the name</span>
-<span id="L588" class="LineNr">588 </span>  <span class="Normal">const</span> string&amp; s = get<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L381'>Name_0f</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L589" class="LineNr">589 </span>  <span class="Identifier">return</span> <span class="Constant">&quot; (&quot;</span>+s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> s<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot; (&quot;</span><span class="Delimiter">))</span>+<span class="Constant">')'</span><span class="Delimiter">;</span>
-<span id="L590" class="LineNr">590 </span><span class="Delimiter">}</span>
-<span id="L591" class="LineNr">591 </span>
-<span id="L592" class="LineNr">592 </span>string <a href='031check_operands.cc.html#L592'>tolower</a><span class="Delimiter">(</span><span class="Normal">const</span> <span class="Normal">char</span>* s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L593" class="LineNr">593 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L594" class="LineNr">594 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">nada</span><span class="Comment">*/</span><span class="Delimiter">;</span>  *s<span class="Delimiter">;</span>  ++s<span class="Delimiter">)</span>
-<span id="L595" class="LineNr">595 </span>    out &lt;&lt; <span class="Normal">static_cast</span>&lt;<span class="Normal">char</span>&gt;<span class="Delimiter">(</span><a href='031check_operands.cc.html#L592'>tolower</a><span class="Delimiter">(</span>*s<span class="Delimiter">));</span>
-<span id="L596" class="LineNr">596 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L597" class="LineNr">597 </span><span class="Delimiter">}</span>
-<span id="L598" class="LineNr">598 </span>
-<span id="L599" class="LineNr">599 </span><span class="Comment">#undef HAS</span>
-<span id="L600" class="LineNr">600 </span><span class="Comment">#undef SET</span>
-<span id="L601" class="LineNr">601 </span><span class="Comment">#undef CLEAR</span>
+<span id="L469" class="LineNr">469 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L469'>test_conflicting_operands_in_modrm_instruction</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L470" class="LineNr">470 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L471" class="LineNr">471 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L472" class="LineNr">472 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L473" class="LineNr">473 </span>      <span class="Constant">&quot;01/add 0/mod 3/mod\n&quot;</span>
+<span id="L474" class="LineNr">474 </span>  <span class="Delimiter">);</span>
+<span id="L475" class="LineNr">475 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L476" class="LineNr">476 </span>      <span class="Constant">&quot;error: '01/add 0/mod 3/mod' has conflicting mod operands\n&quot;</span>
+<span id="L477" class="LineNr">477 </span>  <span class="Delimiter">);</span>
+<span id="L478" class="LineNr">478 </span><span class="Delimiter">}</span>
+<span id="L479" class="LineNr">479 </span>
+<span id="L480" class="LineNr">480 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L480'>test_conflicting_operand_type_modrm</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L481" class="LineNr">481 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L482" class="LineNr">482 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L483" class="LineNr">483 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L484" class="LineNr">484 </span>      <span class="Constant">&quot;01/add 0/mod 3/rm32/r32\n&quot;</span>
+<span id="L485" class="LineNr">485 </span>  <span class="Delimiter">);</span>
+<span id="L486" class="LineNr">486 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L487" class="LineNr">487 </span>      <span class="Constant">&quot;error: '3/rm32/r32' has conflicting operand types; it should have only one\n&quot;</span>
+<span id="L488" class="LineNr">488 </span>  <span class="Delimiter">);</span>
+<span id="L489" class="LineNr">489 </span><span class="Delimiter">}</span>
+<span id="L490" class="LineNr">490 </span>
+<span id="L491" class="LineNr">491 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L491'>test_check_missing_rm32_operand</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L492" class="LineNr">492 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L493" class="LineNr">493 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L494" class="LineNr">494 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L495" class="LineNr">495 </span>      <span class="Constant">&quot;81 0/add/subop 0/mod            1/imm32\n&quot;</span>
+<span id="L496" class="LineNr">496 </span>  <span class="Delimiter">);</span>
+<span id="L497" class="LineNr">497 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L498" class="LineNr">498 </span>      <span class="Constant">&quot;error: '81 0/add/subop 0/mod 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing rm32 operand\n&quot;</span>
+<span id="L499" class="LineNr">499 </span>  <span class="Delimiter">);</span>
+<span id="L500" class="LineNr">500 </span><span class="Delimiter">}</span>
+<span id="L501" class="LineNr">501 </span>
+<span id="L502" class="LineNr">502 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L502'>test_check_missing_subop_operand</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L503" class="LineNr">503 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L504" class="LineNr">504 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L505" class="LineNr">505 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L506" class="LineNr">506 </span>      <span class="Constant">&quot;81             0/mod 3/rm32/ebx 1/imm32\n&quot;</span>
+<span id="L507" class="LineNr">507 </span>  <span class="Delimiter">);</span>
+<span id="L508" class="LineNr">508 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L509" class="LineNr">509 </span>      <span class="Constant">&quot;error: '81 0/mod 3/rm32/ebx 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing subop operand\n&quot;</span>
+<span id="L510" class="LineNr">510 </span>  <span class="Delimiter">);</span>
+<span id="L511" class="LineNr">511 </span><span class="Delimiter">}</span>
+<span id="L512" class="LineNr">512 </span>
+<span id="L513" class="LineNr">513 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L513'>test_check_missing_base_operand</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L514" class="LineNr">514 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L515" class="LineNr">515 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L516" class="LineNr">516 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L517" class="LineNr">517 </span>      <span class="Constant">&quot;81 0/add/subop 0/mod/indirect 4/rm32/use-sib 1/imm32\n&quot;</span>
+<span id="L518" class="LineNr">518 </span>  <span class="Delimiter">);</span>
+<span id="L519" class="LineNr">519 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L520" class="LineNr">520 </span>      <span class="Constant">&quot;error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing base operand\n&quot;</span>
+<span id="L521" class="LineNr">521 </span>  <span class="Delimiter">);</span>
+<span id="L522" class="LineNr">522 </span><span class="Delimiter">}</span>
+<span id="L523" class="LineNr">523 </span>
+<span id="L524" class="LineNr">524 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L524'>test_check_missing_index_operand</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L525" class="LineNr">525 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L526" class="LineNr">526 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L527" class="LineNr">527 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L528" class="LineNr">528 </span>      <span class="Constant">&quot;81 0/add/subop 0/mod/indirect 4/rm32/use-sib 0/base 1/imm32\n&quot;</span>
+<span id="L529" class="LineNr">529 </span>  <span class="Delimiter">);</span>
+<span id="L530" class="LineNr">530 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L531" class="LineNr">531 </span>      <span class="Constant">&quot;error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 0/base 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing index operand\n&quot;</span>
+<span id="L532" class="LineNr">532 </span>  <span class="Delimiter">);</span>
+<span id="L533" class="LineNr">533 </span><span class="Delimiter">}</span>
+<span id="L534" class="LineNr">534 </span>
+<span id="L535" class="LineNr">535 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L535'>test_check_missing_base_operand_2</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L536" class="LineNr">536 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L537" class="LineNr">537 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L538" class="LineNr">538 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L539" class="LineNr">539 </span>      <span class="Constant">&quot;81 0/add/subop 0/mod/indirect 4/rm32/use-sib 2/index 3/scale 1/imm32\n&quot;</span>
+<span id="L540" class="LineNr">540 </span>  <span class="Delimiter">);</span>
+<span id="L541" class="LineNr">541 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L542" class="LineNr">542 </span>      <span class="Constant">&quot;error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 2/index 3/scale 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing base operand\n&quot;</span>
+<span id="L543" class="LineNr">543 </span>  <span class="Delimiter">);</span>
+<span id="L544" class="LineNr">544 </span><span class="Delimiter">}</span>
+<span id="L545" class="LineNr">545 </span>
+<span id="L546" class="LineNr">546 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L546'>test_check_extra_displacement</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L547" class="LineNr">547 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L548" class="LineNr">548 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L549" class="LineNr">549 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L550" class="LineNr">550 </span>      <span class="Constant">&quot;89/copy 0/mod/indirect 0/rm32/EAX 1/r32/ECX 4/disp8\n&quot;</span>
+<span id="L551" class="LineNr">551 </span>  <span class="Delimiter">);</span>
+<span id="L552" class="LineNr">552 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L553" class="LineNr">553 </span>      <span class="Constant">&quot;error: '89/copy 0/mod/indirect 0/rm32/EAX 1/r32/ECX 4/disp8' (copy r32 to rm32): unexpected disp8 operand\n&quot;</span>
+<span id="L554" class="LineNr">554 </span>  <span class="Delimiter">);</span>
+<span id="L555" class="LineNr">555 </span><span class="Delimiter">}</span>
+<span id="L556" class="LineNr">556 </span>
+<span id="L557" class="LineNr">557 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L557'>test_check_duplicate_operand</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L558" class="LineNr">558 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L559" class="LineNr">559 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L560" class="LineNr">560 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L561" class="LineNr">561 </span>      <span class="Constant">&quot;89/copy 0/mod/indirect 0/rm32/EAX 1/r32/ECX 1/r32\n&quot;</span>
+<span id="L562" class="LineNr">562 </span>  <span class="Delimiter">);</span>
+<span id="L563" class="LineNr">563 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L564" class="LineNr">564 </span>      <span class="Constant">&quot;error: '89/copy 0/mod/indirect 0/rm32/EAX 1/r32/ECX 1/r32': duplicate r32 operand\n&quot;</span>
+<span id="L565" class="LineNr">565 </span>  <span class="Delimiter">);</span>
+<span id="L566" class="LineNr">566 </span><span class="Delimiter">}</span>
+<span id="L567" class="LineNr">567 </span>
+<span id="L568" class="LineNr">568 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L568'>test_check_base_operand_not_needed_in_direct_mode</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L569" class="LineNr">569 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L570" class="LineNr">570 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L571" class="LineNr">571 </span>      <span class="Constant">&quot;81 0/add/subop 3/mod/indirect 4/rm32/use-sib 1/imm32\n&quot;</span>
+<span id="L572" class="LineNr">572 </span>  <span class="Delimiter">);</span>
+<span id="L573" class="LineNr">573 </span>  <a href='003trace.cc.html#L270'>CHECK_TRACE_COUNT</a><span class="Delimiter">(</span><span class="Constant">&quot;error&quot;</span><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L574" class="LineNr">574 </span><span class="Delimiter">}</span>
+<span id="L575" class="LineNr">575 </span>
+<span id="L576" class="LineNr">576 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L576'>test_extra_modrm</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L577" class="LineNr">577 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L578" class="LineNr">578 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L579" class="LineNr">579 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L580" class="LineNr">580 </span>      <span class="Constant">&quot;59/pop-to-ECX  3/mod/direct 1/rm32/ECX 4/r32/ESP\n&quot;</span>
+<span id="L581" class="LineNr">581 </span>  <span class="Delimiter">);</span>
+<span id="L582" class="LineNr">582 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L583" class="LineNr">583 </span>      <span class="Constant">&quot;error: '59/pop-to-ECX 3/mod/direct 1/rm32/ECX 4/r32/ESP' (pop top of stack to ECX): unexpected modrm operand\n&quot;</span>
+<span id="L584" class="LineNr">584 </span>  <span class="Delimiter">);</span>
+<span id="L585" class="LineNr">585 </span><span class="Delimiter">}</span>
+<span id="L586" class="LineNr">586 </span>
+<span id="L587" class="LineNr">587 </span><span class="SalientComment">//:: similarly handle multi-byte opcodes</span>
+<span id="L588" class="LineNr">588 </span>
+<span id="L589" class="LineNr">589 </span><span class="Normal">void</span> check_operands_0f<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L590" class="LineNr">590 </span>  assert<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">);</span>
+<span id="L591" class="LineNr">591 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L592" class="LineNr">592 </span>    <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;opcode '0f' requires a second opcode\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L593" class="LineNr">593 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L594" class="LineNr">594 </span>  <span class="Delimiter">}</span>
+<span id="L595" class="LineNr">595 </span>  <a href='011run.cc.html#L126'>word</a> op = <a href='031check_operands.cc.html#L41'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
+<span id="L596" class="LineNr">596 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L388'>Name_0f</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L597" class="LineNr">597 </span>    <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;unknown 2-byte opcode '0f &quot;</span> &lt;&lt; op<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L598" class="LineNr">598 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L599" class="LineNr">599 </span>  <span class="Delimiter">}</span>
+<span id="L600" class="LineNr">600 </span>  check_operands_0f<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L601" class="LineNr">601 </span><span class="Delimiter">}</span>
 <span id="L602" class="LineNr">602 </span>
-<span id="L603" class="LineNr">603 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L604" class="LineNr">604 </span><span class="Comment">#include&lt;cctype&gt;</span>
+<span id="L603" class="LineNr">603 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L603'>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="L604" class="LineNr">604 </span>  <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;no supported opcodes starting with f3\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L605" class="LineNr">605 </span><span class="Delimiter">}</span>
+<span id="L606" class="LineNr">606 </span>
+<span id="L607" class="LineNr">607 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L607'>test_check_missing_disp32_operand</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L608" class="LineNr">608 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L609" class="LineNr">609 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L610" class="LineNr">610 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L611" class="LineNr">611 </span>      <span class="Constant">&quot;  0f 84                                                                                                                                             # jmp if ZF to ??\n&quot;</span>
+<span id="L612" class="LineNr">612 </span>  <span class="Delimiter">);</span>
+<span id="L613" class="LineNr">613 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L614" class="LineNr">614 </span>      <span class="Constant">&quot;error: '0f 84' (jump <a href='040---tests.cc.html#L83'>disp32</a> bytes away if equal, if <a href='010---vm.cc.html#L80'>ZF</a> is set): missing <a href='040---tests.cc.html#L83'>disp32</a> operand\n&quot;</span>
+<span id="L615" class="LineNr">615 </span>  <span class="Delimiter">);</span>
+<span id="L616" class="LineNr">616 </span><span class="Delimiter">}</span>
+<span id="L617" class="LineNr">617 </span>
+<span id="L618" class="LineNr">618 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L619" class="LineNr">619 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">bitvector</span><span class="Comment">*/</span><span class="Normal">uint8_t</span>&gt; <span class="Special"><a href='031check_operands.cc.html#L619'>Permitted_operands_0f</a></span><span class="Delimiter">;</span>
+<span id="L620" class="LineNr">620 </span><span class="Delimiter">:(before &quot;End Init Permitted Operands&quot;)</span>
+<span id="L621" class="LineNr">621 </span><span class="SalientComment">//// Class D: just op and disp32</span>
+<span id="L622" class="LineNr">622 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L623" class="LineNr">623 </span><span class="Comment">//  0     0     1      |0       0     0     0</span>
+<span id="L624" class="LineNr">624 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L619'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;84&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
+<span id="L625" class="LineNr">625 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L619'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;85&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
+<span id="L626" class="LineNr">626 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L619'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
+<span id="L627" class="LineNr">627 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L619'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
+<span id="L628" class="LineNr">628 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L619'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
+<span id="L629" class="LineNr">629 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L619'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
+<span id="L630" class="LineNr">630 </span>
+<span id="L631" class="LineNr">631 </span><span class="SalientComment">//// Class M: using ModR/M byte</span>
+<span id="L632" class="LineNr">632 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L633" class="LineNr">633 </span><span class="Comment">//  0     0     0      |0       0     0     1</span>
+<span id="L634" class="LineNr">634 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L619'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;af&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L635" class="LineNr">635 </span>
+<span id="L636" class="LineNr">636 </span><span class="Delimiter">:(code)</span>
+<span id="L637" class="LineNr">637 </span><span class="Normal">void</span> check_operands_0f<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L638" class="LineNr">638 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L619'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L639" class="LineNr">639 </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#L69'>MODRM</a><span class="Delimiter">))</span>
+<span id="L640" class="LineNr">640 </span>    <a href='031check_operands.cc.html#L367'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L641" class="LineNr">641 </span>  <a href='031check_operands.cc.html#L644'>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#L69'>MODRM</a><span class="Delimiter">),</span> op<span class="Delimiter">);</span>
+<span id="L642" class="LineNr">642 </span><span class="Delimiter">}</span>
+<span id="L643" class="LineNr">643 </span>
+<span id="L644" class="LineNr">644 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L644'>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="L645" class="LineNr">645 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L416'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L301'>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="L646" class="LineNr">646 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L291'>compute_expected_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L647" class="LineNr">647 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L238'>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="L648" class="LineNr">648 </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="L649" class="LineNr">649 </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#L76'>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="L650" class="LineNr">650 </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="L651" class="LineNr">651 </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="L652" class="LineNr">652 </span>    <span class="Normal">const</span> string&amp; optype = <span class="Special"><a href='031check_operands.cc.html#L79'>Operand_type_name</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L653" class="LineNr">653 </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="L654" class="LineNr">654 </span>      <a href='003trace.cc.html#L202'>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#L662'>maybe_name_0f</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L655" class="LineNr">655 </span>    <span class="Normal">else</span>
+<span id="L656" class="LineNr">656 </span>      <a href='003trace.cc.html#L202'>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#L662'>maybe_name_0f</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L657" class="LineNr">657 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
+<span id="L658" class="LineNr">658 </span>  <span class="Delimiter">}</span>
+<span id="L659" class="LineNr">659 </span>  <span class="Comment">// ignore settings in any unused bits</span>
+<span id="L660" class="LineNr">660 </span><span class="Delimiter">}</span>
+<span id="L661" class="LineNr">661 </span>
+<span id="L662" class="LineNr">662 </span>string <a href='031check_operands.cc.html#L662'>maybe_name_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L663" class="LineNr">663 </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="L664" class="LineNr">664 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L388'>Name_0f</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L665" class="LineNr">665 </span>  <span class="Comment">// strip stuff in parens from the name</span>
+<span id="L666" class="LineNr">666 </span>  <span class="Normal">const</span> string&amp; s = get<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L388'>Name_0f</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L667" class="LineNr">667 </span>  <span class="Identifier">return</span> <span class="Constant">&quot; (&quot;</span>+s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> s<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot; (&quot;</span><span class="Delimiter">))</span>+<span class="Constant">')'</span><span class="Delimiter">;</span>
+<span id="L668" class="LineNr">668 </span><span class="Delimiter">}</span>
+<span id="L669" class="LineNr">669 </span>
+<span id="L670" class="LineNr">670 </span>string <a href='031check_operands.cc.html#L670'>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="L671" class="LineNr">671 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L672" class="LineNr">672 </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="L673" class="LineNr">673 </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#L670'>tolower</a><span class="Delimiter">(</span>*s<span class="Delimiter">));</span>
+<span id="L674" class="LineNr">674 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L675" class="LineNr">675 </span><span class="Delimiter">}</span>
+<span id="L676" class="LineNr">676 </span>
+<span id="L677" class="LineNr">677 </span><span class="PreProc">#undef HAS</span>
+<span id="L678" class="LineNr">678 </span><span class="PreProc">#undef SET</span>
+<span id="L679" class="LineNr">679 </span><span class="PreProc">#undef CLEAR</span>
+<span id="L680" class="LineNr">680 </span>
+<span id="L681" class="LineNr">681 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L682" class="LineNr">682 </span><span class="PreProc">#include</span><span class="Constant">&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 e7352f68..1982bfc9 100644
--- a/html/subx/032check_operand_bounds.cc.html
+++ b/html/subx/032check_operand_bounds.cc.html
@@ -14,16 +14,14 @@ pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-
 body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
-.Comment { color: #005faf; }
-.traceContains { color: #005f00; }
+.cSpecial { color: #008000; }
 .LineNr { }
 .Constant { color: #008787; }
-.cSpecial { color: #008000; }
 .Delimiter { color: #c000c0; }
 .Special { color: #d70000; }
 .Identifier { color: #af5f00; }
 .Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
-.PreProc { color: #c000c0; }
+.Comment { color: #005faf; }
 .SalientComment { color: #0000af; }
 -->
 </style>
@@ -60,60 +58,149 @@ if ('onhashchange' in window) {
 <body onload='JumpToLine();'>
 <a href='https://github.com/akkartik/mu/blob/master/subx/032check_operand_bounds.cc'>https://github.com/akkartik/mu/blob/master/subx/032check_operand_bounds.cc</a>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr"> 1 </span><span class="SalientComment">//:: Check that the different operands of an instruction aren't too large for their bitfields.</span>
-<span id="L2" class="LineNr"> 2 </span>
-<span id="L3" class="LineNr"> 3 </span><span class="Delimiter">:(scenario check_bitfield_sizes)</span>
-<span id="L4" class="LineNr"> 4 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L5" class="LineNr"> 5 </span>== <span class="Constant">0x1</span>
-<span id="L6" class="LineNr"> 6 </span><span class="PreProc">0</span><span class="Constant">1</span>/add <span class="Constant">4</span>/mod <span class="Constant">3</span>/rm32 <span class="Constant">1</span>/r32  <span class="Comment"># add ECX to EBX</span>
-<span id="L7" class="LineNr"> 7 </span><span class="traceContains">+error: '4/mod' too large to fit in bitfield mod</span>
-<span id="L8" class="LineNr"> 8 </span>
-<span id="L9" class="LineNr"> 9 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L10" class="LineNr">10 </span>map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt; <span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">;</span>
-<span id="L11" class="LineNr">11 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
-<span id="L12" class="LineNr">12 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;subop&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
-<span id="L13" class="LineNr">13 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">2</span><span class="Delimiter">);</span>
-<span id="L14" class="LineNr">14 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
-<span id="L15" class="LineNr">15 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
-<span id="L16" class="LineNr">16 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
-<span id="L17" class="LineNr">17 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;scale&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">2</span><span class="Delimiter">);</span>
-<span id="L18" class="LineNr">18 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;r32&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
-<span id="L19" class="LineNr">19 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
-<span id="L20" class="LineNr">20 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">16</span><span class="Delimiter">);</span>
-<span id="L21" class="LineNr">21 </span><span class="Comment">// no bound needed for disp32</span>
-<span id="L22" class="LineNr">22 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;imm8&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
-<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><a href='031check_operands.cc.html#L11'>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#L230'>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; <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L30" class="LineNr">30 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- check operand bounds&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L31" class="LineNr">31 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L32" class="LineNr">32 </span>    <span class="Normal">const</span> line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L105'>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#L301'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>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#L114'>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#L230'>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>
-<span id="L38" class="LineNr">38 </span>
-<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 = <span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">.</span>end<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_operand_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>!looks_like_hex_int<span class="Delimiter">(</span>w<span class="Delimiter">.</span>data<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#L355'>parse_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>data<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#L217'>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; end<span class="Delimiter">();</span>
-<span id="L47" class="LineNr">47 </span>    <span class="Delimiter">}</span>
-<span id="L48" class="LineNr">48 </span>    <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L49" class="LineNr">49 </span>      <span class="Comment">// hacky? assuming bound is a power of 2</span>
-<span id="L50" class="LineNr">50 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>x &lt; -<span class="Constant">1</span>*<span class="Normal">static_cast</span>&lt;<span class="Normal">int32_t</span>&gt;<span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>second/<span class="Constant">2</span><span class="Delimiter">))</span>
-<span id="L51" class="LineNr">51 </span>        <a href='003trace.cc.html#L217'>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; end<span class="Delimiter">();</span>
-<span id="L52" class="LineNr">52 </span>    <span class="Delimiter">}</span>
-<span id="L53" class="LineNr">53 </span>  <span class="Delimiter">}</span>
-<span id="L54" class="LineNr">54 </span><span class="Delimiter">}</span>
+<span id="L1" class="LineNr">  1 </span><span class="SalientComment">//:: Check that the different operands of an instruction aren't too large for their bitfields.</span>
+<span id="L2" class="LineNr">  2 </span>
+<span id="L3" class="LineNr">  3 </span><span class="Normal">void</span> <a href='032check_operand_bounds.cc.html#L3'>test_check_bitfield_sizes</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L4" class="LineNr">  4 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L5" class="LineNr">  5 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L6" class="LineNr">  6 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L7" class="LineNr">  7 </span>      <span class="Constant">&quot;01/add 4/mod 3/rm32 1/r32\n&quot;</span>  <span class="Comment">// add ECX to EBX</span>
+<span id="L8" class="LineNr">  8 </span>  <span class="Delimiter">);</span>
+<span id="L9" class="LineNr">  9 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L10" class="LineNr"> 10 </span>      <span class="Constant">&quot;error: '4/mod' too large to fit in bitfield mod\n&quot;</span>
+<span id="L11" class="LineNr"> 11 </span>  <span class="Delimiter">);</span>
+<span id="L12" class="LineNr"> 12 </span><span class="Delimiter">}</span>
+<span id="L13" class="LineNr"> 13 </span>
+<span id="L14" class="LineNr"> 14 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L15" class="LineNr"> 15 </span>map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt; <span class="Special"><a href='032check_operand_bounds.cc.html#L15'>Operand_bound</a></span><span class="Delimiter">;</span>
+<span id="L16" class="LineNr"> 16 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
+<span id="L17" class="LineNr"> 17 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L15'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;subop&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
+<span id="L18" class="LineNr"> 18 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L15'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">2</span><span class="Delimiter">);</span>
+<span id="L19" class="LineNr"> 19 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L15'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
+<span id="L20" class="LineNr"> 20 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L15'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
+<span id="L21" class="LineNr"> 21 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L15'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
+<span id="L22" class="LineNr"> 22 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L15'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;scale&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">2</span><span class="Delimiter">);</span>
+<span id="L23" class="LineNr"> 23 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L15'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;r32&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
+<span id="L24" class="LineNr"> 24 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L15'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
+<span id="L25" class="LineNr"> 25 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L15'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">16</span><span class="Delimiter">);</span>
+<span id="L26" class="LineNr"> 26 </span><span class="Comment">// no bound needed for disp32</span>
+<span id="L27" class="LineNr"> 27 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L15'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;imm8&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
+<span id="L28" class="LineNr"> 28 </span><span class="Comment">// no bound needed for imm32</span>
+<span id="L29" class="LineNr"> 29 </span>
+<span id="L30" class="LineNr"> 30 </span><span class="Delimiter">:(before &quot;Pack Operands(segment code)&quot;)</span>
+<span id="L31" class="LineNr"> 31 </span>check_operand_bounds<span class="Delimiter">(</span>code<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#L238'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L33" class="LineNr"> 33 </span><span class="Delimiter">:(code)</span>
+<span id="L34" class="LineNr"> 34 </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="L35" class="LineNr"> 35 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- check operand bounds&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L36" class="LineNr"> 36 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>code<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L37" class="LineNr"> 37 </span>    <span class="Normal">const</span> line&amp; inst = code<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<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> j = <a href='031check_operands.cc.html#L305'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
+<span id="L39" class="LineNr"> 39 </span>      check_operand_bounds<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">));</span>
+<span id="L40" class="LineNr"> 40 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L238'>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="L41" class="LineNr"> 41 </span>  <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="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="L45" class="LineNr"> 45 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt;::iterator p = <span class="Special"><a href='032check_operand_bounds.cc.html#L15'>Operand_bound</a></span><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special"><a href='032check_operand_bounds.cc.html#L15'>Operand_bound</a></span><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L46" class="LineNr"> 46 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_operand_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="L47" class="LineNr"> 47 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!looks_like_hex_int<span class="Delimiter">(</span>w<span class="Delimiter">.</span>data<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="L48" class="LineNr"> 48 </span>    <span class="Normal">int32_t</span> x = <a href='011run.cc.html#L382'>parse_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L49" class="LineNr"> 49 </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="L50" class="LineNr"> 50 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>first == <span class="Constant">&quot;disp8&quot;</span> || p<span class="Delimiter">-&gt;</span>first == <span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L51" class="LineNr"> 51 </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="Constant">2</span><span class="Delimiter">)</span>
+<span id="L52" class="LineNr"> 52 </span>          <a href='003trace.cc.html#L202'>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 signed bitfield &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L53" class="LineNr"> 53 </span>      <span class="Delimiter">}</span>
+<span id="L54" class="LineNr"> 54 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L55" class="LineNr"> 55 </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="L56" class="LineNr"> 56 </span>          <a href='003trace.cc.html#L202'>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; end<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 class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L60" class="LineNr"> 60 </span>      <span class="Comment">// hacky? assuming bound is a power of 2</span>
+<span id="L61" class="LineNr"> 61 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>x &lt; -<span class="Constant">1</span>*<span class="Normal">static_cast</span>&lt;<span class="Normal">int32_t</span>&gt;<span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>second/<span class="Constant">2</span><span class="Delimiter">))</span>
+<span id="L62" class="LineNr"> 62 </span>        <a href='003trace.cc.html#L202'>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; end<span class="Delimiter">();</span>
+<span id="L63" class="LineNr"> 63 </span>    <span class="Delimiter">}</span>
+<span id="L64" class="LineNr"> 64 </span>  <span class="Delimiter">}</span>
+<span id="L65" class="LineNr"> 65 </span><span class="Delimiter">}</span>
+<span id="L66" class="LineNr"> 66 </span>
+<span id="L67" class="LineNr"> 67 </span><span class="Normal">void</span> <a href='032check_operand_bounds.cc.html#L67'>test_check_bitfield_sizes_for_imm8</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L68" class="LineNr"> 68 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L69" class="LineNr"> 69 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L70" class="LineNr"> 70 </span>      <span class="Constant">&quot;c1/shift 4/subop/left 3/mod/direct 1/rm32/ECX 0xff/imm8&quot;</span>  <span class="Comment">// shift EBX left</span>
+<span id="L71" class="LineNr"> 71 </span>  <span class="Delimiter">);</span>
+<span id="L72" class="LineNr"> 72 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>!trace_contains_errors<span class="Delimiter">());</span>
+<span id="L73" class="LineNr"> 73 </span><span class="Delimiter">}</span>
+<span id="L74" class="LineNr"> 74 </span>
+<span id="L75" class="LineNr"> 75 </span><span class="Normal">void</span> <a href='032check_operand_bounds.cc.html#L75'>test_check_bitfield_sizes_for_imm8_error</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L76" class="LineNr"> 76 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L77" class="LineNr"> 77 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L78" class="LineNr"> 78 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L79" class="LineNr"> 79 </span>      <span class="Constant">&quot;c1/shift 4/subop/left 3/mod/direct 1/rm32/ECX 0x100/imm8&quot;</span>  <span class="Comment">// shift EBX left</span>
+<span id="L80" class="LineNr"> 80 </span>  <span class="Delimiter">);</span>
+<span id="L81" class="LineNr"> 81 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L82" class="LineNr"> 82 </span>      <span class="Constant">&quot;error: '0x100/imm8' too large to fit in bitfield imm8\n&quot;</span>
+<span id="L83" class="LineNr"> 83 </span>  <span class="Delimiter">);</span>
+<span id="L84" class="LineNr"> 84 </span><span class="Delimiter">}</span>
+<span id="L85" class="LineNr"> 85 </span>
+<span id="L86" class="LineNr"> 86 </span><span class="Normal">void</span> <a href='032check_operand_bounds.cc.html#L86'>test_check_bitfield_sizes_for_negative_imm8</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L87" class="LineNr"> 87 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L88" class="LineNr"> 88 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L89" class="LineNr"> 89 </span>      <span class="Constant">&quot;c1/shift 4/subop/left 3/mod/direct 1/rm32/ECX -0x80/imm8&quot;</span>  <span class="Comment">// shift EBX left</span>
+<span id="L90" class="LineNr"> 90 </span>  <span class="Delimiter">);</span>
+<span id="L91" class="LineNr"> 91 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>!trace_contains_errors<span class="Delimiter">());</span>
+<span id="L92" class="LineNr"> 92 </span><span class="Delimiter">}</span>
+<span id="L93" class="LineNr"> 93 </span>
+<span id="L94" class="LineNr"> 94 </span><span class="Normal">void</span> <a href='032check_operand_bounds.cc.html#L94'>test_check_bitfield_sizes_for_negative_imm8_error</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L95" class="LineNr"> 95 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L96" class="LineNr"> 96 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L97" class="LineNr"> 97 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L98" class="LineNr"> 98 </span>      <span class="Constant">&quot;c1/shift 4/subop/left 3/mod/direct 1/rm32/ECX -0x81/imm8&quot;</span>  <span class="Comment">// shift EBX left</span>
+<span id="L99" class="LineNr"> 99 </span>  <span class="Delimiter">);</span>
+<span id="L100" class="LineNr">100 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L101" class="LineNr">101 </span>      <span class="Constant">&quot;error: '-0x81/imm8' too large to fit in bitfield imm8\n&quot;</span>
+<span id="L102" class="LineNr">102 </span>  <span class="Delimiter">);</span>
+<span id="L103" class="LineNr">103 </span><span class="Delimiter">}</span>
+<span id="L104" class="LineNr">104 </span>
+<span id="L105" class="LineNr">105 </span><span class="Normal">void</span> <a href='032check_operand_bounds.cc.html#L105'>test_check_bitfield_sizes_for_disp8</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L106" class="LineNr">106 </span>  <span class="Comment">// not bothering to run</span>
+<span id="L107" class="LineNr">107 </span>  transform<span class="Delimiter">(</span>
+<span id="L108" class="LineNr">108 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L109" class="LineNr">109 </span>      <span class="Constant">&quot;01/add 1/mod/*+disp8 3/rm32 1/r32 0x7f/disp8\n&quot;</span>  <span class="Comment">// add ECX to *(EBX+0x7f)</span>
+<span id="L110" class="LineNr">110 </span>  <span class="Delimiter">);</span>
+<span id="L111" class="LineNr">111 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>!trace_contains_errors<span class="Delimiter">());</span>
+<span id="L112" class="LineNr">112 </span><span class="Delimiter">}</span>
+<span id="L113" class="LineNr">113 </span>
+<span id="L114" class="LineNr">114 </span><span class="Normal">void</span> <a href='032check_operand_bounds.cc.html#L114'>test_check_bitfield_sizes_for_disp8_error</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L115" class="LineNr">115 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L116" class="LineNr">116 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L117" class="LineNr">117 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L118" class="LineNr">118 </span>      <span class="Constant">&quot;01/add 1/mod/*+disp8 3/rm32 1/r32 0x80/disp8\n&quot;</span>  <span class="Comment">// add ECX to *(EBX+0x80)</span>
+<span id="L119" class="LineNr">119 </span>  <span class="Delimiter">);</span>
+<span id="L120" class="LineNr">120 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L121" class="LineNr">121 </span>      <span class="Constant">&quot;error: '0x80/disp8' too large to fit in signed bitfield disp8\n&quot;</span>
+<span id="L122" class="LineNr">122 </span>  <span class="Delimiter">);</span>
+<span id="L123" class="LineNr">123 </span><span class="Delimiter">}</span>
+<span id="L124" class="LineNr">124 </span>
+<span id="L125" class="LineNr">125 </span><span class="Normal">void</span> <a href='032check_operand_bounds.cc.html#L125'>test_check_bitfield_sizes_for_negative_disp8</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L126" class="LineNr">126 </span>  <span class="Comment">// not bothering to run</span>
+<span id="L127" class="LineNr">127 </span>  transform<span class="Delimiter">(</span>
+<span id="L128" class="LineNr">128 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L129" class="LineNr">129 </span>      <span class="Constant">&quot;01/add 1/mod/*+disp8 3/rm32 1/r32 -0x80/disp8\n&quot;</span>  <span class="Comment">// add ECX to *(EBX-0x80)</span>
+<span id="L130" class="LineNr">130 </span>  <span class="Delimiter">);</span>
+<span id="L131" class="LineNr">131 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>!trace_contains_errors<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="Normal">void</span> <a href='032check_operand_bounds.cc.html#L134'>test_check_bitfield_sizes_for_negative_disp8_error</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L135" class="LineNr">135 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L136" class="LineNr">136 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L137" class="LineNr">137 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L138" class="LineNr">138 </span>      <span class="Constant">&quot;01/add 1/mod/*+disp8 3/rm32 1/r32 -0x81/disp8\n&quot;</span>  <span class="Comment">// add ECX to *(EBX-0x81)</span>
+<span id="L139" class="LineNr">139 </span>  <span class="Delimiter">);</span>
+<span id="L140" class="LineNr">140 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L141" class="LineNr">141 </span>      <span class="Constant">&quot;error: '-0x81/disp8' too large to fit in bitfield disp8\n&quot;</span>
+<span id="L142" class="LineNr">142 </span>  <span class="Delimiter">);</span>
+<span id="L143" class="LineNr">143 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/034compute_segment_address.cc.html b/html/subx/034compute_segment_address.cc.html
index 026827e2..6bb28836 100644
--- a/html/subx/034compute_segment_address.cc.html
+++ b/html/subx/034compute_segment_address.cc.html
@@ -14,7 +14,6 @@ pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-
 body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
-.traceContains { color: #005f00; }
 .LineNr { }
 .Constant { color: #008787; }
 .Delimiter { color: #c000c0; }
@@ -22,7 +21,6 @@ a { color:inherit; }
 .Identifier { color: #af5f00; }
 .Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 .Comment { color: #005faf; }
-.PreProc { color: #c000c0; }
 -->
 </style>
 
@@ -62,163 +60,189 @@ if ('onhashchange' in window) {
 <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="Delimiter">:(scenario segment_name)</span>
-<span id="L6" class="LineNr">  6 </span>== <a href='031check_operands.cc.html#L11'>code</a>
-<span id="L7" class="LineNr">  7 </span><span class="PreProc">0</span><span class="Constant">5</span>/add-to-EAX  <span class="Constant">0x0d0c0b0a</span>/imm32
-<span id="L8" class="LineNr">  8 </span><span class="Comment"># code starts at 0x08048000 + p_offset, which is 0x54 for a single-segment binary</span>
-<span id="L9" class="LineNr">  9 </span><span class="traceContains">+load: 0x09000054 -&gt; 05</span>
-<span id="L10" class="LineNr"> 10 </span><span class="traceContains">+load: 0x09000055 -&gt; 0a</span>
-<span id="L11" class="LineNr"> 11 </span><span class="traceContains">+load: 0x09000056 -&gt; 0b</span>
-<span id="L12" class="LineNr"> 12 </span><span class="traceContains">+load: 0x09000057 -&gt; 0c</span>
-<span id="L13" class="LineNr"> 13 </span><span class="traceContains">+load: 0x09000058 -&gt; 0d</span>
-<span id="L14" class="LineNr"> 14 </span><span class="traceContains">+run: add <a href='037heap.cc.html#L23'>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="L15" class="LineNr"> 15 </span><span class="traceContains">+run: storing 0x0d0c0b0a</span>
-<span id="L16" class="LineNr"> 16 </span>
-<span id="L17" class="LineNr"> 17 </span><span class="Comment">//: Update the parser to handle non-numeric segment name.</span>
-<span id="L18" class="LineNr"> 18 </span><span class="Comment">//:</span>
-<span id="L19" class="LineNr"> 19 </span><span class="Comment">//: We'll also support repeated segments with non-numeric names.</span>
-<span id="L20" class="LineNr"> 20 </span>
-<span id="L21" class="LineNr"> 21 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L22" class="LineNr"> 22 </span>map&lt;<span class="Comment">/*</span><span class="Comment">name</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> <span class="Normal">int</span>&gt; <span class="Special"><a href='034compute_segment_address.cc.html#L22'>Segment_index</a></span><span class="Delimiter">;</span>
-<span id="L23" class="LineNr"> 23 </span><span class="Normal">bool</span> <span class="Special"><a href='034compute_segment_address.cc.html#L23'>Currently_parsing_named_segment</a></span> =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// global to permit cross-layer communication</span>
-<span id="L24" class="LineNr"> 24 </span><span class="Normal">int</span> <span class="Special"><a href='034compute_segment_address.cc.html#L24'>Currently_parsing_segment_index</a></span> = -<span class="Constant">1</span><span class="Delimiter">;</span>  <span class="Comment">// global to permit cross-layer communication</span>
-<span id="L25" class="LineNr"> 25 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
-<span id="L26" class="LineNr"> 26 </span><span class="Special"><a href='034compute_segment_address.cc.html#L22'>Segment_index</a></span><span class="Delimiter">.</span>clear<span class="Delimiter">();</span>
-<span id="L27" class="LineNr"> 27 </span><span class="Special"><a href='034compute_segment_address.cc.html#L23'>Currently_parsing_named_segment</a></span> =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L28" class="LineNr"> 28 </span><span class="Special"><a href='034compute_segment_address.cc.html#L24'>Currently_parsing_segment_index</a></span> = -<span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L29" class="LineNr"> 29 </span>
-<span id="L30" class="LineNr"> 30 </span><span class="Delimiter">:(before &quot;End Segment Parsing Special-cases(segment_title)&quot;)</span>
-<span id="L31" class="LineNr"> 31 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!starts_with<span class="Delimiter">(</span>segment_title<span class="Delimiter">,</span> <span class="Constant">&quot;0x&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L32" class="LineNr"> 32 </span>  <span class="Special"><a href='034compute_segment_address.cc.html#L23'>Currently_parsing_named_segment</a></span> =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L33" class="LineNr"> 33 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special"><a href='034compute_segment_address.cc.html#L22'>Segment_index</a></span><span class="Delimiter">,</span> segment_title<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L34" class="LineNr"> 34 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;new segment '&quot;</span> &lt;&lt; segment_title &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L35" class="LineNr"> 35 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>out<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; segment_title != <span class="Constant">&quot;code&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L36" class="LineNr"> 36 </span>      <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;first segment must be 'code' but is '&quot;</span> &lt;&lt; segment_title &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L37" class="LineNr"> 37 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L38" class="LineNr"> 38 </span>    <span class="Delimiter">}</span>
-<span id="L39" class="LineNr"> 39 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>out<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">)</span> == <span class="Constant">1</span> &amp;&amp; segment_title != <span class="Constant">&quot;data&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L40" class="LineNr"> 40 </span>      <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;second segment must be 'data' but is '&quot;</span> &lt;&lt; segment_title &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L41" class="LineNr"> 41 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L42" class="LineNr"> 42 </span>    <span class="Delimiter">}</span>
-<span id="L43" class="LineNr"> 43 </span>    <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='034compute_segment_address.cc.html#L22'>Segment_index</a></span><span class="Delimiter">,</span> segment_title<span class="Delimiter">,</span> <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>out<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">));</span>
-<span id="L44" class="LineNr"> 44 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>segment<span class="Delimiter">());</span>
-<span id="L45" class="LineNr"> 45 </span>  <span class="Delimiter">}</span>
-<span id="L46" class="LineNr"> 46 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L47" class="LineNr"> 47 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;appending to segment '&quot;</span> &lt;&lt; segment_title &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L48" class="LineNr"> 48 </span>  <span class="Delimiter">}</span>
-<span id="L49" class="LineNr"> 49 </span>  <span class="Special"><a href='034compute_segment_address.cc.html#L24'>Currently_parsing_segment_index</a></span> = get<span class="Delimiter">(</span><span class="Special"><a href='034compute_segment_address.cc.html#L22'>Segment_index</a></span><span class="Delimiter">,</span> segment_title<span class="Delimiter">);</span>
-<span id="L50" class="LineNr"> 50 </span><span class="Delimiter">}</span>
-<span id="L51" class="LineNr"> 51 </span>
-<span id="L52" class="LineNr"> 52 </span><span class="Delimiter">:(before &quot;End flush(p, lines) Special-cases&quot;)</span>
-<span id="L53" class="LineNr"> 53 </span><span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='034compute_segment_address.cc.html#L23'>Currently_parsing_named_segment</a></span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L54" class="LineNr"> 54 </span>  assert<span class="Delimiter">(</span>!p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
-<span id="L55" class="LineNr"> 55 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;flushing segment&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L56" class="LineNr"> 56 </span>  vector&lt;line&gt;&amp; curr_segment_data = p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Special"><a href='034compute_segment_address.cc.html#L24'>Currently_parsing_segment_index</a></span><span class="Delimiter">).</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">;</span>
-<span id="L57" class="LineNr"> 57 </span>  curr_segment_data<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>curr_segment_data<span class="Delimiter">.</span>end<span class="Delimiter">(),</span> <a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> <a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>end<span class="Delimiter">());</span>
-<span id="L58" class="LineNr"> 58 </span>  <a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>clear<span class="Delimiter">();</span>
-<span id="L59" class="LineNr"> 59 </span>  <span class="Special"><a href='034compute_segment_address.cc.html#L23'>Currently_parsing_named_segment</a></span> =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L60" class="LineNr"> 60 </span>  <span class="Special"><a href='034compute_segment_address.cc.html#L24'>Currently_parsing_segment_index</a></span> = -<span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L61" class="LineNr"> 61 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L62" class="LineNr"> 62 </span><span class="Delimiter">}</span>
-<span id="L63" class="LineNr"> 63 </span>
-<span id="L64" class="LineNr"> 64 </span><span class="Delimiter">:(scenario repeated_segment_merges_data)</span>
-<span id="L65" class="LineNr"> 65 </span>== <a href='031check_operands.cc.html#L11'>code</a>
-<span id="L66" class="LineNr"> 66 </span><span class="PreProc">0</span><span class="Constant">5</span>/add-to-EAX  <span class="Constant">0x0d0c0b0a</span>/imm32
-<span id="L67" class="LineNr"> 67 </span>== <a href='031check_operands.cc.html#L11'>code</a>
-<span id="L68" class="LineNr"> 68 </span>2d/subtract-from-EAX  <span class="Constant">0xddccbbaa</span>/imm32
-<span id="L69" class="LineNr"> 69 </span><span class="traceContains">+parse: new segment 'code'</span>
-<span id="L70" class="LineNr"> 70 </span><span class="traceContains">+parse: appending to segment 'code'</span>
-<span id="L71" class="LineNr"> 71 </span><span class="Comment"># first segment</span>
-<span id="L72" class="LineNr"> 72 </span><span class="traceContains">+load: 0x09000054 -&gt; 05</span>
-<span id="L73" class="LineNr"> 73 </span><span class="traceContains">+load: 0x09000055 -&gt; 0a</span>
-<span id="L74" class="LineNr"> 74 </span><span class="traceContains">+load: 0x09000056 -&gt; 0b</span>
-<span id="L75" class="LineNr"> 75 </span><span class="traceContains">+load: 0x09000057 -&gt; 0c</span>
-<span id="L76" class="LineNr"> 76 </span><span class="traceContains">+load: 0x09000058 -&gt; 0d</span>
-<span id="L77" class="LineNr"> 77 </span><span class="Comment"># second segment</span>
-<span id="L78" class="LineNr"> 78 </span><span class="traceContains">+load: 0x09000059 -&gt; 2d</span>
-<span id="L79" class="LineNr"> 79 </span><span class="traceContains">+load: 0x0900005a -&gt; aa</span>
-<span id="L80" class="LineNr"> 80 </span><span class="traceContains">+load: 0x0900005b -&gt; bb</span>
-<span id="L81" class="LineNr"> 81 </span><span class="traceContains">+load: 0x0900005c -&gt; cc</span>
-<span id="L82" class="LineNr"> 82 </span><span class="traceContains">+load: 0x0900005d -&gt; dd</span>
-<span id="L83" class="LineNr"> 83 </span>
-<span id="L84" class="LineNr"> 84 </span><span class="Delimiter">:(scenario error_on_missing_segment_header)</span>
-<span id="L85" class="LineNr"> 85 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L86" class="LineNr"> 86 </span><span class="PreProc">0</span><span class="Constant">5</span>/add-to-EAX <span class="Constant">0</span>/imm32
-<span id="L87" class="LineNr"> 87 </span><span class="traceContains">+error: input does not start with a '==' section header</span>
-<span id="L88" class="LineNr"> 88 </span>
-<span id="L89" class="LineNr"> 89 </span><span class="Delimiter">:(scenario error_on_first_segment_not_code)</span>
-<span id="L90" class="LineNr"> 90 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L91" class="LineNr"> 91 </span>== data
-<span id="L92" class="LineNr"> 92 </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">0</span>
-<span id="L93" class="LineNr"> 93 </span><span class="traceContains">+error: first segment must be 'code' but is 'data'</span>
+<span id="L5" class="LineNr">  5 </span><span class="Normal">void</span> <a href='034compute_segment_address.cc.html#L5'>test_segment_name</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L6" class="LineNr">  6 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L7" class="LineNr">  7 </span>      <span class="Constant">&quot;== code\n&quot;</span>
+<span id="L8" class="LineNr">  8 </span>      <span class="Constant">&quot;05/add-to-EAX  0x0d0c0b0a/imm32\n&quot;</span>
+<span id="L9" class="LineNr">  9 </span>      <span class="Comment">// code starts at 0x08048000 + p_offset, which is 0x54 for a single-segment binary</span>
+<span id="L10" class="LineNr"> 10 </span>  <span class="Delimiter">);</span>
+<span id="L11" class="LineNr"> 11 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L12" class="LineNr"> 12 </span>      <span class="Constant">&quot;load: 0x09000054 -&gt; 05\n&quot;</span>
+<span id="L13" class="LineNr"> 13 </span>      <span class="Constant">&quot;load: 0x09000055 -&gt; 0a\n&quot;</span>
+<span id="L14" class="LineNr"> 14 </span>      <span class="Constant">&quot;load: 0x09000056 -&gt; 0b\n&quot;</span>
+<span id="L15" class="LineNr"> 15 </span>      <span class="Constant">&quot;load: 0x09000057 -&gt; 0c\n&quot;</span>
+<span id="L16" class="LineNr"> 16 </span>      <span class="Constant">&quot;load: 0x09000058 -&gt; 0d\n&quot;</span>
+<span id="L17" class="LineNr"> 17 </span>      <span class="Constant">&quot;run: add <a href='037heap.cc.html#L23'>imm32</a> 0x0d0c0b0a to <a href='010---vm.cc.html#L23'>reg</a> EAX\n&quot;</span>
+<span id="L18" class="LineNr"> 18 </span>      <span class="Constant">&quot;run: storing 0x0d0c0b0a\n&quot;</span>
+<span id="L19" class="LineNr"> 19 </span>  <span class="Delimiter">);</span>
+<span id="L20" class="LineNr"> 20 </span><span class="Delimiter">}</span>
+<span id="L21" class="LineNr"> 21 </span>
+<span id="L22" class="LineNr"> 22 </span><span class="Comment">//: Update the parser to handle non-numeric segment name.</span>
+<span id="L23" class="LineNr"> 23 </span><span class="Comment">//:</span>
+<span id="L24" class="LineNr"> 24 </span><span class="Comment">//: We'll also support repeated segments with non-numeric names.</span>
+<span id="L25" class="LineNr"> 25 </span>
+<span id="L26" class="LineNr"> 26 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L27" class="LineNr"> 27 </span>map&lt;<span class="Comment">/*</span><span class="Comment">name</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> <span class="Normal">int</span>&gt; <span class="Special"><a href='034compute_segment_address.cc.html#L27'>Segment_index</a></span><span class="Delimiter">;</span>
+<span id="L28" class="LineNr"> 28 </span><span class="Normal">bool</span> <span class="Special"><a href='034compute_segment_address.cc.html#L28'>Currently_parsing_named_segment</a></span> = <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// global to permit cross-layer communication</span>
+<span id="L29" class="LineNr"> 29 </span><span class="Normal">int</span> <span class="Special"><a href='034compute_segment_address.cc.html#L29'>Currently_parsing_segment_index</a></span> = -<span class="Constant">1</span><span class="Delimiter">;</span>  <span class="Comment">// global to permit cross-layer communication</span>
+<span id="L30" class="LineNr"> 30 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
+<span id="L31" class="LineNr"> 31 </span><span class="Special"><a href='034compute_segment_address.cc.html#L27'>Segment_index</a></span><span class="Delimiter">.</span>clear<span class="Delimiter">();</span>
+<span id="L32" class="LineNr"> 32 </span><span class="Special"><a href='034compute_segment_address.cc.html#L28'>Currently_parsing_named_segment</a></span> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L33" class="LineNr"> 33 </span><span class="Special"><a href='034compute_segment_address.cc.html#L29'>Currently_parsing_segment_index</a></span> = -<span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L34" class="LineNr"> 34 </span>
+<span id="L35" class="LineNr"> 35 </span><span class="Delimiter">:(before &quot;End Segment Parsing Special-cases(segment_title)&quot;)</span>
+<span id="L36" class="LineNr"> 36 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!starts_with<span class="Delimiter">(</span>segment_title<span class="Delimiter">,</span> <span class="Constant">&quot;0x&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L37" class="LineNr"> 37 </span>  <span class="Special"><a href='034compute_segment_address.cc.html#L28'>Currently_parsing_named_segment</a></span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L38" class="LineNr"> 38 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special"><a href='034compute_segment_address.cc.html#L27'>Segment_index</a></span><span class="Delimiter">,</span> segment_title<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L39" class="LineNr"> 39 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;new segment '&quot;</span> &lt;&lt; segment_title &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L40" class="LineNr"> 40 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>out<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; segment_title != <span class="Constant">&quot;code&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L41" class="LineNr"> 41 </span>      <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;first segment must be 'code' but is '&quot;</span> &lt;&lt; segment_title &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L42" class="LineNr"> 42 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L43" class="LineNr"> 43 </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#L166'>SIZE</a><span class="Delimiter">(</span>out<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">)</span> == <span class="Constant">1</span> &amp;&amp; segment_title != <span class="Constant">&quot;data&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L45" class="LineNr"> 45 </span>      <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;second segment must be 'data' but is '&quot;</span> &lt;&lt; segment_title &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L46" class="LineNr"> 46 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L47" class="LineNr"> 47 </span>    <span class="Delimiter">}</span>
+<span id="L48" class="LineNr"> 48 </span>    <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='034compute_segment_address.cc.html#L27'>Segment_index</a></span><span class="Delimiter">,</span> segment_title<span class="Delimiter">,</span> <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>out<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">));</span>
+<span id="L49" class="LineNr"> 49 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>segment<span class="Delimiter">());</span>
+<span id="L50" class="LineNr"> 50 </span>  <span class="Delimiter">}</span>
+<span id="L51" class="LineNr"> 51 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L52" class="LineNr"> 52 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;appending to segment '&quot;</span> &lt;&lt; segment_title &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L53" class="LineNr"> 53 </span>  <span class="Delimiter">}</span>
+<span id="L54" class="LineNr"> 54 </span>  <span class="Special"><a href='034compute_segment_address.cc.html#L29'>Currently_parsing_segment_index</a></span> = get<span class="Delimiter">(</span><span class="Special"><a href='034compute_segment_address.cc.html#L27'>Segment_index</a></span><span class="Delimiter">,</span> segment_title<span class="Delimiter">);</span>
+<span id="L55" class="LineNr"> 55 </span><span class="Delimiter">}</span>
+<span id="L56" class="LineNr"> 56 </span>
+<span id="L57" class="LineNr"> 57 </span><span class="Delimiter">:(before &quot;End flush(p, lines) Special-cases&quot;)</span>
+<span id="L58" class="LineNr"> 58 </span><span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='034compute_segment_address.cc.html#L28'>Currently_parsing_named_segment</a></span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L59" class="LineNr"> 59 </span>  assert<span class="Delimiter">(</span>!p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
+<span id="L60" class="LineNr"> 60 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;flushing segment&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L61" class="LineNr"> 61 </span>  vector&lt;line&gt;&amp; curr_segment_data = p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Special"><a href='034compute_segment_address.cc.html#L29'>Currently_parsing_segment_index</a></span><span class="Delimiter">).</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">;</span>
+<span id="L62" class="LineNr"> 62 </span>  curr_segment_data<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>curr_segment_data<span class="Delimiter">.</span>end<span class="Delimiter">(),</span> <a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> <a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>end<span class="Delimiter">());</span>
+<span id="L63" class="LineNr"> 63 </span>  <a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>clear<span class="Delimiter">();</span>
+<span id="L64" class="LineNr"> 64 </span>  <span class="Special"><a href='034compute_segment_address.cc.html#L28'>Currently_parsing_named_segment</a></span> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L65" class="LineNr"> 65 </span>  <span class="Special"><a href='034compute_segment_address.cc.html#L29'>Currently_parsing_segment_index</a></span> = -<span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L66" class="LineNr"> 66 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L67" class="LineNr"> 67 </span><span class="Delimiter">}</span>
+<span id="L68" class="LineNr"> 68 </span>
+<span id="L69" class="LineNr"> 69 </span><span class="Delimiter">:(code)</span>
+<span id="L70" class="LineNr"> 70 </span><span class="Normal">void</span> <a href='034compute_segment_address.cc.html#L70'>test_repeated_segment_merges_data</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L71" class="LineNr"> 71 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L72" class="LineNr"> 72 </span>      <span class="Constant">&quot;== code\n&quot;</span>
+<span id="L73" class="LineNr"> 73 </span>      <span class="Constant">&quot;05/add-to-EAX  0x0d0c0b0a/imm32\n&quot;</span>
+<span id="L74" class="LineNr"> 74 </span>      <span class="Constant">&quot;== code\n&quot;</span>  <span class="Comment">// again</span>
+<span id="L75" class="LineNr"> 75 </span>      <span class="Constant">&quot;2d/subtract-from-EAX  0xddccbbaa/imm32\n&quot;</span>
+<span id="L76" class="LineNr"> 76 </span>  <span class="Delimiter">);</span>
+<span id="L77" class="LineNr"> 77 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L78" class="LineNr"> 78 </span>      <span class="Constant">&quot;parse: new segment 'code'\n&quot;</span>
+<span id="L79" class="LineNr"> 79 </span>      <span class="Constant">&quot;parse: appending to segment 'code'\n&quot;</span>
+<span id="L80" class="LineNr"> 80 </span>      <span class="Comment">// first segment</span>
+<span id="L81" class="LineNr"> 81 </span>      <span class="Constant">&quot;load: 0x09000054 -&gt; 05\n&quot;</span>
+<span id="L82" class="LineNr"> 82 </span>      <span class="Constant">&quot;load: 0x09000055 -&gt; 0a\n&quot;</span>
+<span id="L83" class="LineNr"> 83 </span>      <span class="Constant">&quot;load: 0x09000056 -&gt; 0b\n&quot;</span>
+<span id="L84" class="LineNr"> 84 </span>      <span class="Constant">&quot;load: 0x09000057 -&gt; 0c\n&quot;</span>
+<span id="L85" class="LineNr"> 85 </span>      <span class="Constant">&quot;load: 0x09000058 -&gt; 0d\n&quot;</span>
+<span id="L86" class="LineNr"> 86 </span>      <span class="Comment">// second segment</span>
+<span id="L87" class="LineNr"> 87 </span>      <span class="Constant">&quot;load: 0x09000059 -&gt; 2d\n&quot;</span>
+<span id="L88" class="LineNr"> 88 </span>      <span class="Constant">&quot;load: 0x0900005a -&gt; aa\n&quot;</span>
+<span id="L89" class="LineNr"> 89 </span>      <span class="Constant">&quot;load: 0x0900005b -&gt; bb\n&quot;</span>
+<span id="L90" class="LineNr"> 90 </span>      <span class="Constant">&quot;load: 0x0900005c -&gt; cc\n&quot;</span>
+<span id="L91" class="LineNr"> 91 </span>      <span class="Constant">&quot;load: 0x0900005d -&gt; dd\n&quot;</span>
+<span id="L92" class="LineNr"> 92 </span>  <span class="Delimiter">);</span>
+<span id="L93" class="LineNr"> 93 </span><span class="Delimiter">}</span>
 <span id="L94" class="LineNr"> 94 </span>
-<span id="L95" class="LineNr"> 95 </span><span class="Delimiter">:(scenario error_on_second_segment_not_data)</span>
-<span id="L96" class="LineNr"> 96 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L97" class="LineNr"> 97 </span>== <a href='031check_operands.cc.html#L11'>code</a>
-<span id="L98" class="LineNr"> 98 </span><span class="PreProc">0</span><span class="Constant">5</span>/add-to-EAX <span class="Constant">0</span>/imm32
-<span id="L99" class="LineNr"> 99 </span>== bss
-<span id="L100" class="LineNr">100 </span><span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>
-<span id="L101" class="LineNr">101 </span><span class="traceContains">+error: second segment must be 'data' but is 'bss'</span>
-<span id="L102" class="LineNr">102 </span>
-<span id="L103" class="LineNr">103 </span><span class="Comment">//: compute segment address</span>
+<span id="L95" class="LineNr"> 95 </span><span class="Normal">void</span> <a href='034compute_segment_address.cc.html#L95'>test_error_on_missing_segment_header</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L96" class="LineNr"> 96 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L97" class="LineNr"> 97 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L98" class="LineNr"> 98 </span>      <span class="Constant">&quot;05/add-to-EAX 0/imm32\n&quot;</span>
+<span id="L99" class="LineNr"> 99 </span>  <span class="Delimiter">);</span>
+<span id="L100" class="LineNr">100 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L101" class="LineNr">101 </span>      <span class="Constant">&quot;error: input does not start with a '==' section header\n&quot;</span>
+<span id="L102" class="LineNr">102 </span>  <span class="Delimiter">);</span>
+<span id="L103" class="LineNr">103 </span><span class="Delimiter">}</span>
 <span id="L104" class="LineNr">104 </span>
-<span id="L105" class="LineNr">105 </span><span class="Delimiter">:(before &quot;End Level-2 Transforms&quot;)</span>
-<span id="L106" class="LineNr">106 </span><span class="Special"><a href='011run.cc.html#L224'>Transform</a></span><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='034compute_segment_address.cc.html#L109'>compute_segment_starts</a><span class="Delimiter">);</span>
-<span id="L107" class="LineNr">107 </span>
-<span id="L108" class="LineNr">108 </span><span class="Delimiter">:(code)</span>
-<span id="L109" class="LineNr">109 </span><span class="Normal">void</span> <a href='034compute_segment_address.cc.html#L109'>compute_segment_starts</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L110" class="LineNr">110 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">3</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; end<span class="Delimiter">();</span>
-<span id="L111" class="LineNr">111 </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#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>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="L112" class="LineNr">112 </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#L96'>segments</a><span class="Delimiter">.</span>size<span class="Delimiter">();</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L113" class="LineNr">113 </span>    segment&amp; curr = p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L114" class="LineNr">114 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>start == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L115" class="LineNr">115 </span>      curr<span class="Delimiter">.</span>start = <a href='012elf.cc.html#L136'>CODE_SEGMENT</a> + i*SPACE_FOR_SEGMENT + p_offset<span class="Delimiter">;</span>
-<span id="L116" class="LineNr">116 </span>      <a href='003trace.cc.html#L98'>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 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; curr<span class="Delimiter">.</span>start &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L117" class="LineNr">117 </span>    <span class="Delimiter">}</span>
-<span id="L118" class="LineNr">118 </span>    p_offset += size_of<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
-<span id="L119" class="LineNr">119 </span>    assert<span class="Delimiter">(</span>p_offset &lt; <a href='010---vm.cc.html#L115'>SEGMENT_ALIGNMENT</a><span class="Delimiter">);</span>  <span class="Comment">// for now we get less and less available space in each successive segment</span>
-<span id="L120" class="LineNr">120 </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">uint32_t</span> size_of<span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L124" class="LineNr">124 </span>  <span class="Normal">uint32_t</span> sum = <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#L166'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L126" class="LineNr">126 </span>    sum += <a href='034compute_segment_address.cc.html#L131'>num_bytes</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L127" class="LineNr">127 </span>  <span class="Identifier">return</span> sum<span class="Delimiter">;</span>
-<span id="L128" class="LineNr">128 </span><span class="Delimiter">}</span>
-<span id="L129" class="LineNr">129 </span>
-<span id="L130" class="LineNr">130 </span><span class="Comment">// Assumes all bitfields are packed.</span>
-<span id="L131" class="LineNr">131 </span><span class="Normal">uint32_t</span> <a href='034compute_segment_address.cc.html#L131'>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="L132" class="LineNr">132 </span>  <span class="Normal">uint32_t</span> sum = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L133" class="LineNr">133 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L134" class="LineNr">134 </span>    sum += size_of<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L135" class="LineNr">135 </span>  <span class="Identifier">return</span> sum<span class="Delimiter">;</span>
-<span id="L136" class="LineNr">136 </span><span class="Delimiter">}</span>
-<span id="L137" class="LineNr">137 </span>
-<span id="L138" class="LineNr">138 </span><span class="Normal">int</span> size_of<span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L139" class="LineNr">139 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>w<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">)</span> || has_operand_metadata<span class="Delimiter">(</span>w<span class="Delimiter">,</span> <span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">))</span>
-<span id="L140" class="LineNr">140 </span>    <span class="Identifier">return</span> <span class="Constant">4</span><span class="Delimiter">;</span>
-<span id="L141" class="LineNr">141 </span>  <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>w<span class="Delimiter">,</span> <span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">))</span>
-<span id="L142" class="LineNr">142 </span>    <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
-<span id="L143" class="LineNr">143 </span>  <span class="Comment">// End size_of(word w) Special-cases</span>
-<span id="L144" class="LineNr">144 </span>  <span class="Normal">else</span>
-<span id="L145" class="LineNr">145 </span>    <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L146" class="LineNr">146 </span><span class="Delimiter">}</span>
-<span id="L147" class="LineNr">147 </span>
-<span id="L148" class="LineNr">148 </span><span class="Comment">//: Dependencies:</span>
-<span id="L149" class="LineNr">149 </span><span class="Comment">//: - We'd like to compute segment addresses before setting up global variables,</span>
-<span id="L150" class="LineNr">150 </span><span class="Comment">//:   because computing addresses for global variables requires knowing where</span>
-<span id="L151" class="LineNr">151 </span><span class="Comment">//:   the data segment starts.</span>
-<span id="L152" class="LineNr">152 </span><span class="Comment">//: - We'd like to finish expanding labels before computing segment addresses,</span>
-<span id="L153" class="LineNr">153 </span><span class="Comment">//:   because it would make computing the sizes of segments more self-contained</span>
-<span id="L154" class="LineNr">154 </span><span class="Comment">//:   (num_bytes).</span>
-<span id="L155" class="LineNr">155 </span><span class="Comment">//:</span>
-<span id="L156" class="LineNr">156 </span><span class="Comment">//: Decision: compute segment addresses before expanding labels, by being</span>
-<span id="L157" class="LineNr">157 </span><span class="Comment">//: aware in this layer of certain operand types that will eventually occupy</span>
-<span id="L158" class="LineNr">158 </span><span class="Comment">//: multiple bytes.</span>
-<span id="L159" class="LineNr">159 </span><span class="Comment">//:</span>
-<span id="L160" class="LineNr">160 </span><span class="Comment">//: The layer to expand labels later hooks into num_bytes() to teach this</span>
-<span id="L161" class="LineNr">161 </span><span class="Comment">//: layer that labels occupy zero space in the binary.</span>
+<span id="L105" class="LineNr">105 </span><span class="Normal">void</span> <a href='034compute_segment_address.cc.html#L105'>test_error_on_first_segment_not_code</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L106" class="LineNr">106 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L107" class="LineNr">107 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L108" class="LineNr">108 </span>      <span class="Constant">&quot;== data\n&quot;</span>
+<span id="L109" class="LineNr">109 </span>      <span class="Constant">&quot;05 00 00 00 00\n&quot;</span>
+<span id="L110" class="LineNr">110 </span>  <span class="Delimiter">);</span>
+<span id="L111" class="LineNr">111 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L112" class="LineNr">112 </span>      <span class="Constant">&quot;error: first segment must be 'code' but is 'data'\n&quot;</span>
+<span id="L113" class="LineNr">113 </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">void</span> <a href='034compute_segment_address.cc.html#L116'>test_error_on_second_segment_not_data</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L117" class="LineNr">117 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L118" class="LineNr">118 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L119" class="LineNr">119 </span>      <span class="Constant">&quot;== code\n&quot;</span>
+<span id="L120" class="LineNr">120 </span>      <span class="Constant">&quot;05/add-to-EAX 0/imm32\n&quot;</span>
+<span id="L121" class="LineNr">121 </span>      <span class="Constant">&quot;== bss\n&quot;</span>
+<span id="L122" class="LineNr">122 </span>      <span class="Constant">&quot;05 00 00 00 00\n&quot;</span>
+<span id="L123" class="LineNr">123 </span>  <span class="Delimiter">);</span>
+<span id="L124" class="LineNr">124 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L125" class="LineNr">125 </span>      <span class="Constant">&quot;error: second segment must be 'data' but is 'bss'\n&quot;</span>
+<span id="L126" class="LineNr">126 </span>  <span class="Delimiter">);</span>
+<span id="L127" class="LineNr">127 </span><span class="Delimiter">}</span>
+<span id="L128" class="LineNr">128 </span>
+<span id="L129" class="LineNr">129 </span><span class="Comment">//: compute segment address</span>
+<span id="L130" class="LineNr">130 </span>
+<span id="L131" class="LineNr">131 </span><span class="Delimiter">:(before &quot;End Level-2 Transforms&quot;)</span>
+<span id="L132" class="LineNr">132 </span><span class="Special"><a href='011run.cc.html#L235'>Transform</a></span><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='034compute_segment_address.cc.html#L135'>compute_segment_starts</a><span class="Delimiter">);</span>
+<span id="L133" class="LineNr">133 </span>
+<span id="L134" class="LineNr">134 </span><span class="Delimiter">:(code)</span>
+<span id="L135" class="LineNr">135 </span><span class="Normal">void</span> <a href='034compute_segment_address.cc.html#L135'>compute_segment_starts</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L136" class="LineNr">136 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">3</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; end<span class="Delimiter">();</span>
+<span id="L137" class="LineNr">137 </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#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>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="L138" class="LineNr">138 </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#L103'>segments</a><span class="Delimiter">.</span>size<span class="Delimiter">();</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L139" class="LineNr">139 </span>    segment&amp; curr = p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L140" class="LineNr">140 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>start == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L141" class="LineNr">141 </span>      curr<span class="Delimiter">.</span>start = <a href='012elf.cc.html#L136'>CODE_SEGMENT</a> + i*SPACE_FOR_SEGMENT + p_offset<span class="Delimiter">;</span>
+<span id="L142" class="LineNr">142 </span>      <a href='003trace.cc.html#L96'>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 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; curr<span class="Delimiter">.</span>start &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L143" class="LineNr">143 </span>    <span class="Delimiter">}</span>
+<span id="L144" class="LineNr">144 </span>    p_offset += size_of<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
+<span id="L145" class="LineNr">145 </span>    assert<span class="Delimiter">(</span>p_offset &lt; <a href='010---vm.cc.html#L115'>SEGMENT_ALIGNMENT</a><span class="Delimiter">);</span>  <span class="Comment">// for now we get less and less available space in each successive segment</span>
+<span id="L146" class="LineNr">146 </span>  <span class="Delimiter">}</span>
+<span id="L147" class="LineNr">147 </span><span class="Delimiter">}</span>
+<span id="L148" class="LineNr">148 </span>
+<span id="L149" class="LineNr">149 </span><span class="Normal">uint32_t</span> size_of<span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L150" class="LineNr">150 </span>  <span class="Normal">uint32_t</span> sum = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L151" class="LineNr">151 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L152" class="LineNr">152 </span>    sum += <a href='034compute_segment_address.cc.html#L157'>num_bytes</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L153" class="LineNr">153 </span>  <span class="Identifier">return</span> sum<span class="Delimiter">;</span>
+<span id="L154" class="LineNr">154 </span><span class="Delimiter">}</span>
+<span id="L155" class="LineNr">155 </span>
+<span id="L156" class="LineNr">156 </span><span class="Comment">// Assumes all bitfields are packed.</span>
+<span id="L157" class="LineNr">157 </span><span class="Normal">uint32_t</span> <a href='034compute_segment_address.cc.html#L157'>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="L158" class="LineNr">158 </span>  <span class="Normal">uint32_t</span> sum = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L159" class="LineNr">159 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L160" class="LineNr">160 </span>    sum += size_of<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L161" class="LineNr">161 </span>  <span class="Identifier">return</span> sum<span class="Delimiter">;</span>
+<span id="L162" class="LineNr">162 </span><span class="Delimiter">}</span>
+<span id="L163" class="LineNr">163 </span>
+<span id="L164" class="LineNr">164 </span><span class="Normal">int</span> size_of<span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L165" class="LineNr">165 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>w<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">)</span> || has_operand_metadata<span class="Delimiter">(</span>w<span class="Delimiter">,</span> <span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">))</span>
+<span id="L166" class="LineNr">166 </span>    <span class="Identifier">return</span> <span class="Constant">4</span><span class="Delimiter">;</span>
+<span id="L167" class="LineNr">167 </span>  <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>w<span class="Delimiter">,</span> <span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">))</span>
+<span id="L168" class="LineNr">168 </span>    <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
+<span id="L169" class="LineNr">169 </span>  <span class="Comment">// End size_of(word w) Special-cases</span>
+<span id="L170" class="LineNr">170 </span>  <span class="Normal">else</span>
+<span id="L171" class="LineNr">171 </span>    <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L172" class="LineNr">172 </span><span class="Delimiter">}</span>
+<span id="L173" class="LineNr">173 </span>
+<span id="L174" class="LineNr">174 </span><span class="Comment">//: Dependencies:</span>
+<span id="L175" class="LineNr">175 </span><span class="Comment">//: - We'd like to compute segment addresses before setting up global variables,</span>
+<span id="L176" class="LineNr">176 </span><span class="Comment">//:   because computing addresses for global variables requires knowing where</span>
+<span id="L177" class="LineNr">177 </span><span class="Comment">//:   the data segment starts.</span>
+<span id="L178" class="LineNr">178 </span><span class="Comment">//: - We'd like to finish expanding labels before computing segment addresses,</span>
+<span id="L179" class="LineNr">179 </span><span class="Comment">//:   because it would make computing the sizes of segments more self-contained</span>
+<span id="L180" class="LineNr">180 </span><span class="Comment">//:   (num_bytes).</span>
+<span id="L181" class="LineNr">181 </span><span class="Comment">//:</span>
+<span id="L182" class="LineNr">182 </span><span class="Comment">//: Decision: compute segment addresses before expanding labels, by being</span>
+<span id="L183" class="LineNr">183 </span><span class="Comment">//: aware in this layer of certain operand types that will eventually occupy</span>
+<span id="L184" class="LineNr">184 </span><span class="Comment">//: multiple bytes.</span>
+<span id="L185" class="LineNr">185 </span><span class="Comment">//:</span>
+<span id="L186" class="LineNr">186 </span><span class="Comment">//: The layer to expand labels later hooks into num_bytes() to teach this</span>
+<span id="L187" class="LineNr">187 </span><span class="Comment">//: layer that labels occupy zero space in the binary.</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/035labels.cc.html b/html/subx/035labels.cc.html
index 62856945..e860c568 100644
--- a/html/subx/035labels.cc.html
+++ b/html/subx/035labels.cc.html
@@ -14,8 +14,6 @@ pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-
 body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
-.traceAbsent { color: #c00000; }
-.traceContains { color: #005f00; }
 .LineNr { }
 .Constant { color: #008787; }
 .Delimiter { color: #c000c0; }
@@ -24,7 +22,6 @@ a { color:inherit; }
 .Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 .Comment { color: #005faf; }
 .cSpecial { color: #008000; }
-.PreProc { color: #c000c0; }
 -->
 </style>
 
@@ -83,291 +80,345 @@ if ('onhashchange' in window) {
 <span id="L21" class="LineNr"> 21 </span>
 <span id="L22" class="LineNr"> 22 </span><span class="Comment">//: One special label: the address to start running the program at.</span>
 <span id="L23" class="LineNr"> 23 </span>
-<span id="L24" class="LineNr"> 24 </span><span class="Delimiter">:(scenario entry_label)</span>
-<span id="L25" class="LineNr"> 25 </span>== <span class="Constant">0x1</span>
-<span id="L26" class="LineNr"> 26 </span><span class="PreProc">0</span><span class="Constant">5</span> <span class="Constant">0x0d0c0b0a</span>/imm32
-<span id="L27" class="LineNr"> 27 </span><span class="Special">Entry</span>:
-<span id="L28" class="LineNr"> 28 </span><span class="PreProc">0</span><span class="Constant">5</span> <span class="Constant">0x0d0c0b0a</span>/imm32
-<span id="L29" class="LineNr"> 29 </span><span class="traceContains">+run: 0x00000006 opcode: 05</span>
-<span id="L30" class="LineNr"> 30 </span><span class="traceAbsent">-run: 0x00000001 opcode: 05</span>
-<span id="L31" class="LineNr"> 31 </span>
-<span id="L32" class="LineNr"> 32 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L33" class="LineNr"> 33 </span><span class="Normal">uint32_t</span> <span class="Special">Entry_address</span> = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L34" class="LineNr"> 34 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
-<span id="L35" class="LineNr"> 35 </span><span class="Special">Entry_address</span> = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L36" class="LineNr"> 36 </span><span class="Delimiter">:(before &quot;End Initialize EIP&quot;)</span>
-<span id="L37" class="LineNr"> 37 </span><span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special">Entry_address</span><span class="Delimiter">)</span> EIP = <span class="Special">Entry_address</span><span class="Delimiter">;</span>
-<span id="L38" class="LineNr"> 38 </span><span class="Delimiter">:(after &quot;Override e_entry&quot;)</span>
-<span id="L39" class="LineNr"> 39 </span><span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special">Entry_address</span><span class="Delimiter">)</span> <a href='035labels.cc.html#L39'>e_entry</a> = <span class="Special">Entry_address</span><span class="Delimiter">;</span>
-<span id="L40" class="LineNr"> 40 </span>
-<span id="L41" class="LineNr"> 41 </span><span class="Delimiter">:(before &quot;End looks_like_hex_int(s) Detectors&quot;)</span>
-<span id="L42" class="LineNr"> 42 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">)</span> == <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L43" class="LineNr"> 43 </span>
-<span id="L44" class="LineNr"> 44 </span><span class="Delimiter">:(scenarios transform)</span>
-<span id="L45" class="LineNr"> 45 </span><span class="Delimiter">:(scenario pack_immediate_ignores_single_byte_nondigit_operand)</span>
-<span id="L46" class="LineNr"> 46 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L47" class="LineNr"> 47 </span>== <span class="Constant">0x1</span>
-<span id="L48" class="LineNr"> 48 </span>b9/copy  a/imm32
-<span id="L49" class="LineNr"> 49 </span><span class="traceContains">+transform: packing instruction 'b9/copy a/imm32'</span>
-<span id="L50" class="LineNr"> 50 </span><span class="Comment"># no change (we're just not printing metadata to the trace)</span>
-<span id="L51" class="LineNr"> 51 </span><span class="traceContains">+transform: instruction after packing: 'b9 a'</span>
-<span id="L52" class="LineNr"> 52 </span>
-<span id="L53" class="LineNr"> 53 </span><span class="Delimiter">:(scenario pack_immediate_ignores_3_hex_digit_operand)</span>
-<span id="L54" class="LineNr"> 54 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L55" class="LineNr"> 55 </span>== <span class="Constant">0x1</span>
-<span id="L56" class="LineNr"> 56 </span>b9/copy  aaa/imm32
-<span id="L57" class="LineNr"> 57 </span><span class="traceContains">+transform: packing instruction 'b9/copy aaa/imm32'</span>
-<span id="L58" class="LineNr"> 58 </span><span class="Comment"># no change (we're just not printing metadata to the trace)</span>
-<span id="L59" class="LineNr"> 59 </span><span class="traceContains">+transform: instruction after packing: 'b9 aaa'</span>
-<span id="L60" class="LineNr"> 60 </span>
-<span id="L61" class="LineNr"> 61 </span><span class="Delimiter">:(scenario pack_immediate_ignores_non_hex_operand)</span>
-<span id="L62" class="LineNr"> 62 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L63" class="LineNr"> 63 </span>== <span class="Constant">0x1</span>
-<span id="L64" class="LineNr"> 64 </span>b9/copy xxx/imm32
-<span id="L65" class="LineNr"> 65 </span><span class="traceContains">+transform: packing instruction 'b9/copy xxx/imm32'</span>
-<span id="L66" class="LineNr"> 66 </span><span class="Comment"># no change (we're just not printing metadata to the trace)</span>
-<span id="L67" class="LineNr"> 67 </span><span class="traceContains">+transform: instruction after packing: 'b9 xxx'</span>
-<span id="L68" class="LineNr"> 68 </span>
-<span id="L69" class="LineNr"> 69 </span><span class="Comment">//: a helper we'll find handy later</span>
-<span id="L70" class="LineNr"> 70 </span><span class="Delimiter">:(code)</span>
-<span id="L71" class="LineNr"> 71 </span><span class="Normal">void</span> <a href='035labels.cc.html#L71'>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="L72" class="LineNr"> 72 </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="L73" class="LineNr"> 73 </span>    <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;empty name!\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L74" class="LineNr"> 74 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L75" class="LineNr"> 75 </span>  <span class="Delimiter">}</span>
-<span id="L76" class="LineNr"> 76 </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="L77" class="LineNr"> 77 </span>    <a href='003trace.cc.html#L217'>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 name\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L78" class="LineNr"> 78 </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="L79" class="LineNr"> 79 </span>    <a href='003trace.cc.html#L217'>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 name\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L80" class="LineNr"> 80 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L81" class="LineNr"> 81 </span>  <span class="Delimiter">}</span>
-<span id="L82" class="LineNr"> 82 </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="L83" class="LineNr"> 83 </span>    <a href='003trace.cc.html#L217'>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.\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L84" class="LineNr"> 84 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">)</span> == <span class="Constant">2</span><span class="Delimiter">)</span>
-<span id="L85" class="LineNr"> 85 </span>    <a href='003trace.cc.html#L217'>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 name\n&quot;</span> &lt;&lt; end<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="Comment">//: Now that that's done, let's start using names as labels.</span>
-<span id="L89" class="LineNr"> 89 </span>
-<span id="L90" class="LineNr"> 90 </span><span class="Delimiter">:(scenario map_label)</span>
-<span id="L91" class="LineNr"> 91 </span>== <span class="Constant">0x1</span>
-<span id="L92" class="LineNr"> 92 </span><span class="Normal">loop</span>:
-<span id="L93" class="LineNr"> 93 </span>  <span class="PreProc">0</span><span class="Constant">5</span>  <span class="Constant">0x0d0c0b0a</span>/imm32
-<span id="L94" class="LineNr"> 94 </span><span class="traceContains">+transform: label 'loop' is at address 1</span>
-<span id="L95" class="LineNr"> 95 </span>
-<span id="L96" class="LineNr"> 96 </span><span class="Delimiter">:(before &quot;End Level-2 Transforms&quot;)</span>
-<span id="L97" class="LineNr"> 97 </span><span class="Special"><a href='011run.cc.html#L224'>Transform</a></span><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='035labels.cc.html#L99'>rewrite_labels</a><span class="Delimiter">);</span>
-<span id="L98" class="LineNr"> 98 </span><span class="Delimiter">:(code)</span>
-<span id="L99" class="LineNr"> 99 </span><span class="Normal">void</span> <a href='035labels.cc.html#L99'>rewrite_labels</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L100" class="LineNr">100 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">3</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; end<span class="Delimiter">();</span>
-<span id="L101" class="LineNr">101 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L102" class="LineNr">102 </span>  segment&amp; <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L103" class="LineNr">103 </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="L104" class="LineNr">104 </span>  <a href='035labels.cc.html#L113'>compute_byte_indices_for_labels</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">,</span> byte_index<span class="Delimiter">);</span>
-<span id="L105" class="LineNr">105 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L230'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L106" class="LineNr">106 </span>  <a href='035labels.cc.html#L178'>drop_labels</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">);</span>
-<span id="L107" class="LineNr">107 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L230'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L108" class="LineNr">108 </span>  <a href='035labels.cc.html#L190'>replace_labels_with_displacements</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">,</span> byte_index<span class="Delimiter">);</span>
-<span id="L109" class="LineNr">109 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L256'>contains_key</a><span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> <span class="Constant">&quot;Entry&quot;</span><span class="Delimiter">))</span>
-<span id="L110" class="LineNr">110 </span>    <span class="Special">Entry_address</span> = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>start + get<span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> <span class="Constant">&quot;Entry&quot;</span><span class="Delimiter">);</span>
-<span id="L111" class="LineNr">111 </span><span class="Delimiter">}</span>
-<span id="L112" class="LineNr">112 </span>
-<span id="L113" class="LineNr">113 </span><span class="Normal">void</span> <a href='035labels.cc.html#L113'>compute_byte_indices_for_labels</a><span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; <a href='031check_operands.cc.html#L11'>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="L114" class="LineNr">114 </span>  <span class="Normal">int</span> current_byte = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L115" class="LineNr">115 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L116" class="LineNr">116 </span>    <span class="Normal">const</span> line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L117" class="LineNr">117 </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#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L118" class="LineNr">118 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
-<span id="L119" class="LineNr">119 </span>      <span class="Comment">// hack: if we have any operand metadata left after previous transforms,</span>
-<span id="L120" class="LineNr">120 </span>      <span class="Comment">// deduce its size</span>
-<span id="L121" class="LineNr">121 </span>      <span class="Comment">// Maybe we should just move this transform to before instruction</span>
-<span id="L122" class="LineNr">122 </span>      <span class="Comment">// packing, and deduce the size of *all* operands. But then we'll also</span>
-<span id="L123" class="LineNr">123 </span>      <span class="Comment">// have to deal with bitfields.</span>
-<span id="L124" class="LineNr">124 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">)</span> || has_operand_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="L125" class="LineNr">125 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span>data<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> == <span class="Constant">':'</span><span class="Delimiter">)</span>
-<span id="L126" class="LineNr">126 </span>          <a href='003trace.cc.html#L217'>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\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L127" class="LineNr">127 </span>        current_byte += <span class="Constant">4</span><span class="Delimiter">;</span>
-<span id="L128" class="LineNr">128 </span>      <span class="Delimiter">}</span>
-<span id="L129" class="LineNr">129 </span>      <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_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="L130" class="LineNr">130 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span>data<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> == <span class="Constant">':'</span><span class="Delimiter">)</span>
-<span id="L131" class="LineNr">131 </span>          <a href='003trace.cc.html#L217'>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\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L132" class="LineNr">132 </span>        current_byte += <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="Comment">// automatically handle /disp8 and /imm8 here</span>
-<span id="L135" class="LineNr">135 </span>      <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span>data<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> != <span class="Constant">':'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L136" class="LineNr">136 </span>        ++current_byte<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>        string label = <a href='035labels.cc.html#L234'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L140" class="LineNr">140 </span>        <span class="Comment">// ensure labels look sufficiently different from raw hex</span>
-<span id="L141" class="LineNr">141 </span>        <a href='035labels.cc.html#L71'>check_valid_name</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
-<span id="L142" class="LineNr">142 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L230'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L143" class="LineNr">143 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L396'>contains_any_operand_metadata</a><span class="Delimiter">(</span>curr<span class="Delimiter">))</span>
-<span id="L144" class="LineNr">144 </span>          <a href='003trace.cc.html#L217'>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;': label definition (':') not allowed in operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L145" class="LineNr">145 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>j &gt; <span class="Constant">0</span><span class="Delimiter">)</span>
-<span id="L146" class="LineNr">146 </span>          <a href='003trace.cc.html#L217'>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#L119'>word</a> in a line.\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L147" class="LineNr">147 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='035labels.cc.html#L163'>Map_file</a></span><span class="Delimiter">.</span>is_open<span class="Delimiter">())</span>
-<span id="L148" class="LineNr">148 </span>          <span class="Special"><a href='035labels.cc.html#L163'>Map_file</a></span> &lt;&lt; <span class="Constant">&quot;0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; <span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>start + current_byte<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">' '</span> &lt;&lt; label &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L149" class="LineNr">149 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L256'>contains_key</a><span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> label<span class="Delimiter">)</span> &amp;&amp; label != <span class="Constant">&quot;Entry&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L150" class="LineNr">150 </span>          <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;duplicate label '&quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L151" class="LineNr">151 </span>          <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L152" class="LineNr">152 </span>        <span class="Delimiter">}</span>
-<span id="L153" class="LineNr">153 </span>        <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> label<span class="Delimiter">,</span> current_byte<span class="Delimiter">);</span>
-<span id="L154" class="LineNr">154 </span>        <a href='003trace.cc.html#L98'>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>start<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L155" class="LineNr">155 </span>        <span class="Comment">// no modifying current_byte; label definitions won't be in the final binary</span>
-<span id="L156" class="LineNr">156 </span>      <span class="Delimiter">}</span>
-<span id="L157" class="LineNr">157 </span>    <span class="Delimiter">}</span>
-<span id="L158" class="LineNr">158 </span>  <span class="Delimiter">}</span>
-<span id="L159" class="LineNr">159 </span><span class="Delimiter">}</span>
-<span id="L160" class="LineNr">160 </span>
-<span id="L161" class="LineNr">161 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L162" class="LineNr">162 </span><span class="Normal">bool</span> <span class="Special"><a href='035labels.cc.html#L162'>Dump_map</a></span> =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// currently used only by 'subx translate'</span>
-<span id="L163" class="LineNr">163 </span>ofstream <span class="Special"><a href='035labels.cc.html#L163'>Map_file</a></span><span class="Delimiter">;</span>
-<span id="L164" class="LineNr">164 </span><span class="Delimiter">:(before &quot;End Commandline Options&quot;)</span>
-<span id="L165" class="LineNr">165 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L98'>is_equal</a><span class="Delimiter">(</span>*arg<span class="Delimiter">,</span> <span class="Constant">&quot;--map&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L166" class="LineNr">166 </span>  <span class="Special"><a href='035labels.cc.html#L162'>Dump_map</a></span> =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L167" class="LineNr">167 </span>  <span class="Comment">// End --map Settings</span>
-<span id="L168" class="LineNr">168 </span><span class="Delimiter">}</span>
-<span id="L169" class="LineNr">169 </span><span class="Comment">//: wait to open &quot;map&quot; for writing until we're sure we aren't trying to read it</span>
-<span id="L170" class="LineNr">170 </span><span class="Delimiter">:(after &quot;Begin subx translate&quot;)</span>
-<span id="L171" class="LineNr">171 </span><span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='035labels.cc.html#L162'>Dump_map</a></span><span class="Delimiter">)</span>
-<span id="L172" class="LineNr">172 </span>  <span class="Special"><a href='035labels.cc.html#L163'>Map_file</a></span><span class="Delimiter">.</span>open<span class="Delimiter">(</span><span class="Constant">&quot;map&quot;</span><span class="Delimiter">);</span>
-<span id="L173" class="LineNr">173 </span><span class="Delimiter">:(before &quot;End subx translate&quot;)</span>
-<span id="L174" class="LineNr">174 </span><span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='035labels.cc.html#L162'>Dump_map</a></span><span class="Delimiter">)</span>
-<span id="L175" class="LineNr">175 </span>  <span class="Special"><a href='035labels.cc.html#L163'>Map_file</a></span><span class="Delimiter">.</span>close<span class="Delimiter">();</span>
-<span id="L176" class="LineNr">176 </span>
-<span id="L177" class="LineNr">177 </span><span class="Delimiter">:(code)</span>
-<span id="L178" class="LineNr">178 </span><span class="Normal">void</span> <a href='035labels.cc.html#L178'>drop_labels</a><span class="Delimiter">(</span>segment&amp; <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">)</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#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L180" class="LineNr">180 </span>    line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L181" class="LineNr">181 </span>    vector&lt;word&gt;::iterator new_end = remove_if<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>end<span class="Delimiter">(),</span> <a href='035labels.cc.html#L186'>is_label</a><span class="Delimiter">);</span>
-<span id="L182" class="LineNr">182 </span>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>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#L114'>words</a><span class="Delimiter">.</span>end<span class="Delimiter">());</span>
-<span id="L183" class="LineNr">183 </span>  <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">bool</span> <a href='035labels.cc.html#L186'>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="L187" class="LineNr">187 </span>  <span class="Identifier">return</span> *w<span class="Delimiter">.</span>data<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> == <span class="Constant">':'</span><span class="Delimiter">;</span>
-<span id="L188" class="LineNr">188 </span><span class="Delimiter">}</span>
-<span id="L189" class="LineNr">189 </span>
-<span id="L190" class="LineNr">190 </span><span class="Normal">void</span> <a href='035labels.cc.html#L190'>replace_labels_with_displacements</a><span class="Delimiter">(</span>segment&amp; <a href='031check_operands.cc.html#L11'>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="L191" class="LineNr">191 </span>  <span class="Normal">int32_t</span> byte_index_next_instruction_starts_at = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L192" class="LineNr">192 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L193" class="LineNr">193 </span>    line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L194" class="LineNr">194 </span>    byte_index_next_instruction_starts_at += <a href='034compute_segment_address.cc.html#L131'>num_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L195" class="LineNr">195 </span>    <a href='011run.cc.html#L113'>line</a> new_inst<span class="Delimiter">;</span>
-<span id="L196" class="LineNr">196 </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#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L197" class="LineNr">197 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
-<span id="L198" class="LineNr">198 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L256'>contains_key</a><span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L199" class="LineNr">199 </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>data<span class="Delimiter">))</span> - byte_index_next_instruction_starts_at<span class="Delimiter">;</span>
-<span id="L200" class="LineNr">200 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L201" class="LineNr">201 </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="L202" class="LineNr">202 </span>            <a href='003trace.cc.html#L217'>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;': label 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\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L203" class="LineNr">203 </span>          <span class="Normal">else</span>
-<span id="L204" class="LineNr">204 </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="L205" class="LineNr">205 </span>        <span class="Delimiter">}</span>
-<span id="L206" class="LineNr">206 </span>        <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_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="L207" class="LineNr">207 </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="L208" class="LineNr">208 </span>            <a href='003trace.cc.html#L217'>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;': label 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\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L209" class="LineNr">209 </span>          <span class="Normal">else</span>
-<span id="L210" class="LineNr">210 </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="L211" class="LineNr">211 </span>        <span class="Delimiter">}</span>
-<span id="L212" class="LineNr">212 </span>        <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L213" class="LineNr">213 </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="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">else</span> <span class="Delimiter">{</span>
-<span id="L217" class="LineNr">217 </span>        new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<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>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">);</span>
-<span id="L221" class="LineNr">221 </span>    <a href='003trace.cc.html#L98'>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#L227'>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; end<span class="Delimiter">();</span>
-<span id="L222" class="LineNr">222 </span>  <span class="Delimiter">}</span>
-<span id="L223" class="LineNr">223 </span><span class="Delimiter">}</span>
-<span id="L224" class="LineNr">224 </span>
-<span id="L225" class="LineNr">225 </span>string <a href='035labels.cc.html#L225'>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="L226" class="LineNr">226 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L227" class="LineNr">227 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L228" class="LineNr">228 </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="L229" class="LineNr">229 </span>    out &lt;&lt; inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>data<span class="Delimiter">;</span>
-<span id="L230" class="LineNr">230 </span>  <span class="Delimiter">}</span>
-<span id="L231" class="LineNr">231 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L232" class="LineNr">232 </span><span class="Delimiter">}</span>
-<span id="L233" class="LineNr">233 </span>
-<span id="L234" class="LineNr">234 </span>string <a href='035labels.cc.html#L234'>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="L235" class="LineNr">235 </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>end<span class="Delimiter">());</span>
-<span id="L236" class="LineNr">236 </span><span class="Delimiter">}</span>
-<span id="L237" class="LineNr">237 </span>
-<span id="L238" class="LineNr">238 </span><span class="Comment">//: Label definitions must be the first word on a line. No jumping inside</span>
-<span id="L239" class="LineNr">239 </span><span class="Comment">//: instructions.</span>
-<span id="L240" class="LineNr">240 </span><span class="Comment">//: They should also be the only word on a line.</span>
-<span id="L241" class="LineNr">241 </span><span class="Comment">//: However, you can absolutely have multiple labels map to the same address,</span>
-<span id="L242" class="LineNr">242 </span><span class="Comment">//: as long as they're on separate lines.</span>
-<span id="L243" class="LineNr">243 </span>
-<span id="L244" class="LineNr">244 </span><span class="Delimiter">:(scenario multiple_labels_at)</span>
-<span id="L245" class="LineNr">245 </span>== <span class="Constant">0x1</span>
-<span id="L246" class="LineNr">246 </span><span class="Comment"># address 1</span>
-<span id="L247" class="LineNr">247 </span><span class="Normal">loop</span>:
-<span id="L248" class="LineNr">248 </span> $loop2:
-<span id="L249" class="LineNr">249 </span><span class="Comment"># address 1 (labels take up no space)</span>
-<span id="L250" class="LineNr">250 </span>    <span class="PreProc">0</span><span class="Constant">5</span>  <span class="Constant">0x0d0c0b0a</span>/imm32
-<span id="L251" class="LineNr">251 </span><span class="Comment"># address 6</span>
-<span id="L252" class="LineNr">252 </span>    eb  $loop2/disp8
-<span id="L253" class="LineNr">253 </span><span class="Comment"># address 8</span>
-<span id="L254" class="LineNr">254 </span>    eb  $loop3/disp8
-<span id="L255" class="LineNr">255 </span><span class="Comment"># address 0xa</span>
-<span id="L256" class="LineNr">256 </span> $loop3:
-<span id="L257" class="LineNr">257 </span><span class="traceContains">+transform: label 'loop' is at address 1</span>
-<span id="L258" class="LineNr">258 </span><span class="traceContains">+transform: label '$loop2' is at address 1</span>
-<span id="L259" class="LineNr">259 </span><span class="traceContains">+transform: label '$loop3' is at address a</span>
-<span id="L260" class="LineNr">260 </span><span class="Comment"># first jump is to -7</span>
-<span id="L261" class="LineNr">261 </span><span class="traceContains">+transform: instruction after <a href='011run.cc.html#L227'>transform</a>: 'eb f9'</span>
-<span id="L262" class="LineNr">262 </span><span class="Comment"># second jump is to 0 (fall through)</span>
-<span id="L263" class="LineNr">263 </span><span class="traceContains">+transform: instruction after <a href='011run.cc.html#L227'>transform</a>: 'eb 00'</span>
-<span id="L264" class="LineNr">264 </span>
-<span id="L265" class="LineNr">265 </span><span class="Delimiter">:(scenario duplicate_label)</span>
-<span id="L266" class="LineNr">266 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L267" class="LineNr">267 </span>== <span class="Constant">0x1</span>
-<span id="L268" class="LineNr">268 </span><span class="Normal">loop</span>:
-<span id="L269" class="LineNr">269 </span><span class="Normal">loop</span>:
-<span id="L270" class="LineNr">270 </span>    <span class="PreProc">0</span><span class="Constant">5</span>  <span class="Constant">0x0d0c0b0a</span>/imm32
-<span id="L271" class="LineNr">271 </span><span class="traceContains">+error: duplicate label 'loop'</span>
-<span id="L272" class="LineNr">272 </span>
-<span id="L273" class="LineNr">273 </span><span class="Delimiter">:(scenario label_too_short)</span>
-<span id="L274" class="LineNr">274 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L275" class="LineNr">275 </span>== <span class="Constant">0x1</span>
-<span id="L276" class="LineNr">276 </span><span class="Normal">xz</span>:
-<span id="L277" class="LineNr">277 </span>  <span class="PreProc">0</span><span class="Constant">5</span>  <span class="Constant">0x0d0c0b0a</span>/imm32
-<span id="L278" class="LineNr">278 </span><span class="traceContains">+error: 'xz' is two characters long which can look like raw hex bytes at a glance; use a different name</span>
-<span id="L279" class="LineNr">279 </span>
-<span id="L280" class="LineNr">280 </span><span class="Delimiter">:(scenario label_hex)</span>
-<span id="L281" class="LineNr">281 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L282" class="LineNr">282 </span>== <span class="Constant">0x1</span>
-<span id="L283" class="LineNr">283 </span><span class="Constant">0xab</span>:
-<span id="L284" class="LineNr">284 </span>  <span class="PreProc">0</span><span class="Constant">5</span>  <span class="Constant">0x0d0c0b0a</span>/imm32
-<span id="L285" class="LineNr">285 </span><span class="traceContains">+error: '0xab' looks like a hex number; use a different name</span>
-<span id="L286" class="LineNr">286 </span>
-<span id="L287" class="LineNr">287 </span><span class="Delimiter">:(scenario label_negative_hex)</span>
-<span id="L288" class="LineNr">288 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L289" class="LineNr">289 </span>== <span class="Constant">0x1</span>
-<span id="L290" class="LineNr">290 </span> -a:  <span class="Comment"># indent to avoid looking like a trace_should_not_contain command for this scenario</span>
-<span id="L291" class="LineNr">291 </span>    <span class="PreProc">0</span><span class="Constant">5</span>  <span class="Constant">0x0d0c0b0a</span>/imm32
-<span id="L292" class="LineNr">292 </span><span class="traceContains">+error: '-a' starts with '-', which can be confused with a negative number; use a different name</span>
+<span id="L24" class="LineNr"> 24 </span><span class="Normal">void</span> <a href='035labels.cc.html#L24'>test_entry_label</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L25" class="LineNr"> 25 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L26" class="LineNr"> 26 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L27" class="LineNr"> 27 </span>      <span class="Constant">&quot;05 0x0d0c0b0a/imm32\n&quot;</span>
+<span id="L28" class="LineNr"> 28 </span>      <span class="Constant">&quot;Entry:\n&quot;</span>
+<span id="L29" class="LineNr"> 29 </span>      <span class="Constant">&quot;05 0x0d0c0b0a/imm32\n&quot;</span>
+<span id="L30" class="LineNr"> 30 </span>  <span class="Delimiter">);</span>
+<span id="L31" class="LineNr"> 31 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L32" class="LineNr"> 32 </span>      <span class="Constant">&quot;run: 0x00000006 opcode: 05\n&quot;</span>
+<span id="L33" class="LineNr"> 33 </span>  <span class="Delimiter">);</span>
+<span id="L34" class="LineNr"> 34 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;run: 0x00000001 opcode: 05&quot;</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="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L38" class="LineNr"> 38 </span><span class="Normal">uint32_t</span> <span class="Special">Entry_address</span> = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L39" class="LineNr"> 39 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
+<span id="L40" class="LineNr"> 40 </span><span class="Special">Entry_address</span> = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L41" class="LineNr"> 41 </span><span class="Delimiter">:(before &quot;End Initialize EIP&quot;)</span>
+<span id="L42" class="LineNr"> 42 </span><span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special">Entry_address</span><span class="Delimiter">)</span> EIP = <span class="Special">Entry_address</span><span class="Delimiter">;</span>
+<span id="L43" class="LineNr"> 43 </span><span class="Delimiter">:(after &quot;Override e_entry&quot;)</span>
+<span id="L44" class="LineNr"> 44 </span><span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special">Entry_address</span><span class="Delimiter">)</span> <a href='035labels.cc.html#L44'>e_entry</a> = <span class="Special">Entry_address</span><span class="Delimiter">;</span>
+<span id="L45" class="LineNr"> 45 </span>
+<span id="L46" class="LineNr"> 46 </span><span class="Delimiter">:(before &quot;End looks_like_hex_int(s) Detectors&quot;)</span>
+<span id="L47" class="LineNr"> 47 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">)</span> == <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L48" class="LineNr"> 48 </span>
+<span id="L49" class="LineNr"> 49 </span><span class="Delimiter">:(code)</span>
+<span id="L50" class="LineNr"> 50 </span><span class="Normal">void</span> <a href='035labels.cc.html#L50'>test_pack_immediate_ignores_single_byte_nondigit_operand</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L51" class="LineNr"> 51 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L52" class="LineNr"> 52 </span>  transform<span class="Delimiter">(</span>
+<span id="L53" class="LineNr"> 53 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L54" class="LineNr"> 54 </span>      <span class="Constant">&quot;b9/copy  a/imm32\n&quot;</span>
+<span id="L55" class="LineNr"> 55 </span>  <span class="Delimiter">);</span>
+<span id="L56" class="LineNr"> 56 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L57" class="LineNr"> 57 </span>      <span class="Constant">&quot;transform: packing instruction 'b9/copy a/imm32'\n&quot;</span>
+<span id="L58" class="LineNr"> 58 </span>      <span class="Comment">// no change (we're just not printing metadata to the trace)</span>
+<span id="L59" class="LineNr"> 59 </span>      <span class="Constant">&quot;transform: instruction after packing: 'b9 a'\n&quot;</span>
+<span id="L60" class="LineNr"> 60 </span>  <span class="Delimiter">);</span>
+<span id="L61" class="LineNr"> 61 </span><span class="Delimiter">}</span>
+<span id="L62" class="LineNr"> 62 </span>
+<span id="L63" class="LineNr"> 63 </span><span class="Normal">void</span> <a href='035labels.cc.html#L63'>test_pack_immediate_ignores_3_hex_digit_operand</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L64" class="LineNr"> 64 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L65" class="LineNr"> 65 </span>  transform<span class="Delimiter">(</span>
+<span id="L66" class="LineNr"> 66 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L67" class="LineNr"> 67 </span>      <span class="Constant">&quot;b9/copy  aaa/imm32\n&quot;</span>
+<span id="L68" class="LineNr"> 68 </span>  <span class="Delimiter">);</span>
+<span id="L69" class="LineNr"> 69 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L70" class="LineNr"> 70 </span>      <span class="Constant">&quot;transform: packing instruction 'b9/copy aaa/imm32'\n&quot;</span>
+<span id="L71" class="LineNr"> 71 </span>      <span class="Comment">// no change (we're just not printing metadata to the trace)</span>
+<span id="L72" class="LineNr"> 72 </span>      <span class="Constant">&quot;transform: instruction after packing: 'b9 aaa'\n&quot;</span>
+<span id="L73" class="LineNr"> 73 </span>  <span class="Delimiter">);</span>
+<span id="L74" class="LineNr"> 74 </span><span class="Delimiter">}</span>
+<span id="L75" class="LineNr"> 75 </span>
+<span id="L76" class="LineNr"> 76 </span><span class="Normal">void</span> <a href='035labels.cc.html#L76'>test_pack_immediate_ignores_non_hex_operand</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L77" class="LineNr"> 77 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L78" class="LineNr"> 78 </span>  transform<span class="Delimiter">(</span>
+<span id="L79" class="LineNr"> 79 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L80" class="LineNr"> 80 </span>      <span class="Constant">&quot;b9/copy xxx/imm32\n&quot;</span>
+<span id="L81" class="LineNr"> 81 </span>  <span class="Delimiter">);</span>
+<span id="L82" class="LineNr"> 82 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L83" class="LineNr"> 83 </span>      <span class="Constant">&quot;transform: packing instruction 'b9/copy xxx/imm32'\n&quot;</span>
+<span id="L84" class="LineNr"> 84 </span>      <span class="Comment">// no change (we're just not printing metadata to the trace)</span>
+<span id="L85" class="LineNr"> 85 </span>      <span class="Constant">&quot;transform: instruction after packing: 'b9 xxx'\n&quot;</span>
+<span id="L86" class="LineNr"> 86 </span>  <span class="Delimiter">);</span>
+<span id="L87" class="LineNr"> 87 </span><span class="Delimiter">}</span>
+<span id="L88" class="LineNr"> 88 </span>
+<span id="L89" class="LineNr"> 89 </span><span class="Comment">//: a helper we'll find handy later</span>
+<span id="L90" class="LineNr"> 90 </span><span class="Normal">void</span> <a href='035labels.cc.html#L90'>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="L91" class="LineNr"> 91 </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="L92" class="LineNr"> 92 </span>    <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;empty name!\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L93" class="LineNr"> 93 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L94" class="LineNr"> 94 </span>  <span class="Delimiter">}</span>
+<span id="L95" class="LineNr"> 95 </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="L96" class="LineNr"> 96 </span>    <a href='003trace.cc.html#L202'>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 name\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L97" class="LineNr"> 97 </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="L98" class="LineNr"> 98 </span>    <a href='003trace.cc.html#L202'>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 name\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L99" class="LineNr"> 99 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L100" class="LineNr">100 </span>  <span class="Delimiter">}</span>
+<span id="L101" class="LineNr">101 </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="L102" class="LineNr">102 </span>    <a href='003trace.cc.html#L202'>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.\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L103" class="LineNr">103 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">)</span> == <span class="Constant">2</span><span class="Delimiter">)</span>
+<span id="L104" class="LineNr">104 </span>    <a href='003trace.cc.html#L202'>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 name\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L105" class="LineNr">105 </span><span class="Delimiter">}</span>
+<span id="L106" class="LineNr">106 </span>
+<span id="L107" class="LineNr">107 </span><span class="Comment">//: Now that that's done, let's start using names as labels.</span>
+<span id="L108" class="LineNr">108 </span>
+<span id="L109" class="LineNr">109 </span><span class="Normal">void</span> <a href='035labels.cc.html#L109'>test_map_label</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L110" class="LineNr">110 </span>  transform<span class="Delimiter">(</span>
+<span id="L111" class="LineNr">111 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L112" class="LineNr">112 </span>      <span class="Constant">&quot;loop:\n&quot;</span>
+<span id="L113" class="LineNr">113 </span>      <span class="Constant">&quot;  05  0x0d0c0b0a/imm32\n&quot;</span>
+<span id="L114" class="LineNr">114 </span>  <span class="Delimiter">);</span>
+<span id="L115" class="LineNr">115 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L116" class="LineNr">116 </span>      <span class="Constant">&quot;transform: label 'loop' is at address 1\n&quot;</span>
+<span id="L117" class="LineNr">117 </span>  <span class="Delimiter">);</span>
+<span id="L118" class="LineNr">118 </span><span class="Delimiter">}</span>
+<span id="L119" class="LineNr">119 </span>
+<span id="L120" class="LineNr">120 </span><span class="Delimiter">:(before &quot;End Level-2 Transforms&quot;)</span>
+<span id="L121" class="LineNr">121 </span><span class="Special"><a href='011run.cc.html#L235'>Transform</a></span><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='035labels.cc.html#L123'>rewrite_labels</a><span class="Delimiter">);</span>
+<span id="L122" class="LineNr">122 </span><span class="Delimiter">:(code)</span>
+<span id="L123" class="LineNr">123 </span><span class="Normal">void</span> <a href='035labels.cc.html#L123'>rewrite_labels</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L124" class="LineNr">124 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">3</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; end<span class="Delimiter">();</span>
+<span id="L125" class="LineNr">125 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L126" class="LineNr">126 </span>  segment&amp; code = p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L127" class="LineNr">127 </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="L128" class="LineNr">128 </span>  <a href='035labels.cc.html#L137'>compute_byte_indices_for_labels</a><span class="Delimiter">(</span>code<span class="Delimiter">,</span> byte_index<span class="Delimiter">);</span>
+<span id="L129" class="LineNr">129 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L238'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L130" class="LineNr">130 </span>  <a href='035labels.cc.html#L202'>drop_labels</a><span class="Delimiter">(</span>code<span class="Delimiter">);</span>
+<span id="L131" class="LineNr">131 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L238'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L132" class="LineNr">132 </span>  <a href='035labels.cc.html#L214'>replace_labels_with_displacements</a><span class="Delimiter">(</span>code<span class="Delimiter">,</span> byte_index<span class="Delimiter">);</span>
+<span id="L133" class="LineNr">133 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L256'>contains_key</a><span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> <span class="Constant">&quot;Entry&quot;</span><span class="Delimiter">))</span>
+<span id="L134" class="LineNr">134 </span>    <span class="Special">Entry_address</span> = code<span class="Delimiter">.</span>start + get<span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> <span class="Constant">&quot;Entry&quot;</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="Normal">void</span> <a href='035labels.cc.html#L137'>compute_byte_indices_for_labels</a><span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; code<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="L138" class="LineNr">138 </span>  <span class="Normal">int</span> current_byte = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L139" class="LineNr">139 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>code<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L140" class="LineNr">140 </span>    <span class="Normal">const</span> line&amp; inst = code<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L141" class="LineNr">141 </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#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L142" class="LineNr">142 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
+<span id="L143" class="LineNr">143 </span>      <span class="Comment">// hack: if we have any operand metadata left after previous transforms,</span>
+<span id="L144" class="LineNr">144 </span>      <span class="Comment">// deduce its size</span>
+<span id="L145" class="LineNr">145 </span>      <span class="Comment">// Maybe we should just move this transform to before instruction</span>
+<span id="L146" class="LineNr">146 </span>      <span class="Comment">// packing, and deduce the size of *all* operands. But then we'll also</span>
+<span id="L147" class="LineNr">147 </span>      <span class="Comment">// have to deal with bitfields.</span>
+<span id="L148" class="LineNr">148 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">)</span> || has_operand_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="L149" class="LineNr">149 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span>data<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> == <span class="Constant">':'</span><span class="Delimiter">)</span>
+<span id="L150" class="LineNr">150 </span>          <a href='003trace.cc.html#L202'>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\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L151" class="LineNr">151 </span>        current_byte += <span class="Constant">4</span><span class="Delimiter">;</span>
+<span id="L152" class="LineNr">152 </span>      <span class="Delimiter">}</span>
+<span id="L153" class="LineNr">153 </span>      <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_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="L154" class="LineNr">154 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span>data<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> == <span class="Constant">':'</span><span class="Delimiter">)</span>
+<span id="L155" class="LineNr">155 </span>          <a href='003trace.cc.html#L202'>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\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L156" class="LineNr">156 </span>        current_byte += <span class="Constant">2</span><span class="Delimiter">;</span>
+<span id="L157" class="LineNr">157 </span>      <span class="Delimiter">}</span>
+<span id="L158" class="LineNr">158 </span>      <span class="Comment">// automatically handle /disp8 and /imm8 here</span>
+<span id="L159" class="LineNr">159 </span>      <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span>data<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> != <span class="Constant">':'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L160" class="LineNr">160 </span>        ++current_byte<span class="Delimiter">;</span>
+<span id="L161" class="LineNr">161 </span>      <span class="Delimiter">}</span>
+<span id="L162" class="LineNr">162 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L163" class="LineNr">163 </span>        string label = <a href='035labels.cc.html#L258'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L164" class="LineNr">164 </span>        <span class="Comment">// ensure labels look sufficiently different from raw hex</span>
+<span id="L165" class="LineNr">165 </span>        <a href='035labels.cc.html#L90'>check_valid_name</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
+<span id="L166" class="LineNr">166 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L238'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L167" class="LineNr">167 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L433'>contains_any_operand_metadata</a><span class="Delimiter">(</span>curr<span class="Delimiter">))</span>
+<span id="L168" class="LineNr">168 </span>          <a href='003trace.cc.html#L202'>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;': label definition (':') not allowed in operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L169" class="LineNr">169 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>j &gt; <span class="Constant">0</span><span class="Delimiter">)</span>
+<span id="L170" class="LineNr">170 </span>          <a href='003trace.cc.html#L202'>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#L126'>word</a> in a line.\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L171" class="LineNr">171 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='035labels.cc.html#L187'>Map_file</a></span><span class="Delimiter">.</span>is_open<span class="Delimiter">())</span>
+<span id="L172" class="LineNr">172 </span>          <span class="Special"><a href='035labels.cc.html#L187'>Map_file</a></span> &lt;&lt; <span class="Constant">&quot;0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; <span class="Delimiter">(</span>code<span class="Delimiter">.</span>start + current_byte<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">' '</span> &lt;&lt; label &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L173" class="LineNr">173 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L256'>contains_key</a><span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> label<span class="Delimiter">)</span> &amp;&amp; label != <span class="Constant">&quot;Entry&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L174" class="LineNr">174 </span>          <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;duplicate label '&quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L175" class="LineNr">175 </span>          <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L176" class="LineNr">176 </span>        <span class="Delimiter">}</span>
+<span id="L177" class="LineNr">177 </span>        <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> label<span class="Delimiter">,</span> current_byte<span class="Delimiter">);</span>
+<span id="L178" class="LineNr">178 </span>        <a href='003trace.cc.html#L96'>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>start<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L179" class="LineNr">179 </span>        <span class="Comment">// no modifying current_byte; label definitions won't be in the final binary</span>
+<span id="L180" class="LineNr">180 </span>      <span class="Delimiter">}</span>
+<span id="L181" class="LineNr">181 </span>    <span class="Delimiter">}</span>
+<span id="L182" class="LineNr">182 </span>  <span class="Delimiter">}</span>
+<span id="L183" class="LineNr">183 </span><span class="Delimiter">}</span>
+<span id="L184" class="LineNr">184 </span>
+<span id="L185" class="LineNr">185 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L186" class="LineNr">186 </span><span class="Normal">bool</span> <span class="Special"><a href='035labels.cc.html#L186'>Dump_map</a></span> = <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// currently used only by 'subx translate'</span>
+<span id="L187" class="LineNr">187 </span>ofstream <span class="Special"><a href='035labels.cc.html#L187'>Map_file</a></span><span class="Delimiter">;</span>
+<span id="L188" class="LineNr">188 </span><span class="Delimiter">:(before &quot;End Commandline Options&quot;)</span>
+<span id="L189" class="LineNr">189 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L98'>is_equal</a><span class="Delimiter">(</span>*arg<span class="Delimiter">,</span> <span class="Constant">&quot;--map&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L190" class="LineNr">190 </span>  <span class="Special"><a href='035labels.cc.html#L186'>Dump_map</a></span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L191" class="LineNr">191 </span>  <span class="Comment">// End --map Settings</span>
+<span id="L192" class="LineNr">192 </span><span class="Delimiter">}</span>
+<span id="L193" class="LineNr">193 </span><span class="Comment">//: wait to open &quot;map&quot; for writing until we're sure we aren't trying to read it</span>
+<span id="L194" class="LineNr">194 </span><span class="Delimiter">:(after &quot;Begin subx translate&quot;)</span>
+<span id="L195" class="LineNr">195 </span><span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='035labels.cc.html#L186'>Dump_map</a></span><span class="Delimiter">)</span>
+<span id="L196" class="LineNr">196 </span>  <span class="Special"><a href='035labels.cc.html#L187'>Map_file</a></span><span class="Delimiter">.</span>open<span class="Delimiter">(</span><span class="Constant">&quot;map&quot;</span><span class="Delimiter">);</span>
+<span id="L197" class="LineNr">197 </span><span class="Delimiter">:(before &quot;End subx translate&quot;)</span>
+<span id="L198" class="LineNr">198 </span><span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='035labels.cc.html#L186'>Dump_map</a></span><span class="Delimiter">)</span>
+<span id="L199" class="LineNr">199 </span>  <span class="Special"><a href='035labels.cc.html#L187'>Map_file</a></span><span class="Delimiter">.</span>close<span class="Delimiter">();</span>
+<span id="L200" class="LineNr">200 </span>
+<span id="L201" class="LineNr">201 </span><span class="Delimiter">:(code)</span>
+<span id="L202" class="LineNr">202 </span><span class="Normal">void</span> <a href='035labels.cc.html#L202'>drop_labels</a><span class="Delimiter">(</span>segment&amp; code<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L203" class="LineNr">203 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>code<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L204" class="LineNr">204 </span>    line&amp; inst = code<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L205" class="LineNr">205 </span>    vector&lt;word&gt;::iterator new_end = remove_if<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>end<span class="Delimiter">(),</span> <a href='035labels.cc.html#L210'>is_label</a><span class="Delimiter">);</span>
+<span id="L206" class="LineNr">206 </span>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>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#L121'>words</a><span class="Delimiter">.</span>end<span class="Delimiter">());</span>
+<span id="L207" class="LineNr">207 </span>  <span class="Delimiter">}</span>
+<span id="L208" class="LineNr">208 </span><span class="Delimiter">}</span>
+<span id="L209" class="LineNr">209 </span>
+<span id="L210" class="LineNr">210 </span><span class="Normal">bool</span> <a href='035labels.cc.html#L210'>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="L211" class="LineNr">211 </span>  <span class="Identifier">return</span> *w<span class="Delimiter">.</span>data<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> == <span class="Constant">':'</span><span class="Delimiter">;</span>
+<span id="L212" class="LineNr">212 </span><span class="Delimiter">}</span>
+<span id="L213" class="LineNr">213 </span>
+<span id="L214" class="LineNr">214 </span><span class="Normal">void</span> <a href='035labels.cc.html#L214'>replace_labels_with_displacements</a><span class="Delimiter">(</span>segment&amp; code<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="L215" class="LineNr">215 </span>  <span class="Normal">int32_t</span> byte_index_next_instruction_starts_at = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L216" class="LineNr">216 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>code<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L217" class="LineNr">217 </span>    line&amp; inst = code<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L218" class="LineNr">218 </span>    byte_index_next_instruction_starts_at += <a href='034compute_segment_address.cc.html#L157'>num_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L219" class="LineNr">219 </span>    <a href='011run.cc.html#L120'>line</a> new_inst<span class="Delimiter">;</span>
+<span id="L220" class="LineNr">220 </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#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L221" class="LineNr">221 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
+<span id="L222" class="LineNr">222 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L256'>contains_key</a><span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L223" class="LineNr">223 </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>data<span class="Delimiter">))</span> - byte_index_next_instruction_starts_at<span class="Delimiter">;</span>
+<span id="L224" class="LineNr">224 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L225" class="LineNr">225 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>displacement &gt; <span class="Constant">0x7f</span> || displacement &lt; -<span class="Constant">0x7f</span><span class="Delimiter">)</span>
+<span id="L226" class="LineNr">226 </span>            <a href='003trace.cc.html#L202'>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;': label too far away for displacement &quot;</span> &lt;&lt; std::hex &lt;&lt; displacement &lt;&lt; <span class="Constant">&quot; to fit in 8 signed bits\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L227" class="LineNr">227 </span>          <span class="Normal">else</span>
+<span id="L228" class="LineNr">228 </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="L229" class="LineNr">229 </span>        <span class="Delimiter">}</span>
+<span id="L230" class="LineNr">230 </span>        <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_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="L231" class="LineNr">231 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>displacement &gt; <span class="Constant">0x7fff</span> || displacement &lt; -<span class="Constant">0x7fff</span><span class="Delimiter">)</span>
+<span id="L232" class="LineNr">232 </span>            <a href='003trace.cc.html#L202'>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;': label too far away for displacement &quot;</span> &lt;&lt; std::hex &lt;&lt; displacement &lt;&lt; <span class="Constant">&quot; to fit in 16 signed bits\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L233" class="LineNr">233 </span>          <span class="Normal">else</span>
+<span id="L234" class="LineNr">234 </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="L235" class="LineNr">235 </span>        <span class="Delimiter">}</span>
+<span id="L236" class="LineNr">236 </span>        <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L237" class="LineNr">237 </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="L238" class="LineNr">238 </span>        <span class="Delimiter">}</span>
+<span id="L239" class="LineNr">239 </span>      <span class="Delimiter">}</span>
+<span id="L240" class="LineNr">240 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L241" class="LineNr">241 </span>        new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
+<span id="L242" class="LineNr">242 </span>      <span class="Delimiter">}</span>
+<span id="L243" class="LineNr">243 </span>    <span class="Delimiter">}</span>
+<span id="L244" class="LineNr">244 </span>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">);</span>
+<span id="L245" class="LineNr">245 </span>    <a href='003trace.cc.html#L96'>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 transform: '&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; end<span class="Delimiter">();</span>
+<span id="L246" class="LineNr">246 </span>  <span class="Delimiter">}</span>
+<span id="L247" class="LineNr">247 </span><span class="Delimiter">}</span>
+<span id="L248" class="LineNr">248 </span>
+<span id="L249" class="LineNr">249 </span>string <a href='035labels.cc.html#L249'>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="L250" class="LineNr">250 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L251" class="LineNr">251 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L252" class="LineNr">252 </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="L253" class="LineNr">253 </span>    out &lt;&lt; inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>data<span class="Delimiter">;</span>
+<span id="L254" class="LineNr">254 </span>  <span class="Delimiter">}</span>
+<span id="L255" class="LineNr">255 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L256" class="LineNr">256 </span><span class="Delimiter">}</span>
+<span id="L257" class="LineNr">257 </span>
+<span id="L258" class="LineNr">258 </span>string <a href='035labels.cc.html#L258'>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="L259" class="LineNr">259 </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>end<span class="Delimiter">());</span>
+<span id="L260" class="LineNr">260 </span><span class="Delimiter">}</span>
+<span id="L261" class="LineNr">261 </span>
+<span id="L262" class="LineNr">262 </span><span class="Comment">//: Label definitions must be the first word on a line. No jumping inside</span>
+<span id="L263" class="LineNr">263 </span><span class="Comment">//: instructions.</span>
+<span id="L264" class="LineNr">264 </span><span class="Comment">//: They should also be the only word on a line.</span>
+<span id="L265" class="LineNr">265 </span><span class="Comment">//: However, you can absolutely have multiple labels map to the same address,</span>
+<span id="L266" class="LineNr">266 </span><span class="Comment">//: as long as they're on separate lines.</span>
+<span id="L267" class="LineNr">267 </span>
+<span id="L268" class="LineNr">268 </span><span class="Normal">void</span> <a href='035labels.cc.html#L268'>test_multiple_labels_at</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L269" class="LineNr">269 </span>  transform<span class="Delimiter">(</span>
+<span id="L270" class="LineNr">270 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L271" class="LineNr">271 </span>      <span class="Comment">// address 1</span>
+<span id="L272" class="LineNr">272 </span>      <span class="Constant">&quot;loop:\n&quot;</span>
+<span id="L273" class="LineNr">273 </span>      <span class="Constant">&quot; $loop2:\n&quot;</span>
+<span id="L274" class="LineNr">274 </span>      <span class="Comment">// address 1 (labels take up no space)</span>
+<span id="L275" class="LineNr">275 </span>      <span class="Constant">&quot;    05  0x0d0c0b0a/imm32\n&quot;</span>
+<span id="L276" class="LineNr">276 </span>      <span class="Comment">// address 6</span>
+<span id="L277" class="LineNr">277 </span>      <span class="Constant">&quot;    eb  $loop2/disp8\n&quot;</span>
+<span id="L278" class="LineNr">278 </span>      <span class="Comment">// address 8</span>
+<span id="L279" class="LineNr">279 </span>      <span class="Constant">&quot;    eb  $loop3/disp8\n&quot;</span>
+<span id="L280" class="LineNr">280 </span>      <span class="Comment">// address 0xa</span>
+<span id="L281" class="LineNr">281 </span>      <span class="Constant">&quot; $loop3:\n&quot;</span>
+<span id="L282" class="LineNr">282 </span>  <span class="Delimiter">);</span>
+<span id="L283" class="LineNr">283 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L284" class="LineNr">284 </span>      <span class="Constant">&quot;transform: label 'loop' is at address 1\n&quot;</span>
+<span id="L285" class="LineNr">285 </span>      <span class="Constant">&quot;transform: label '$loop2' is at address 1\n&quot;</span>
+<span id="L286" class="LineNr">286 </span>      <span class="Constant">&quot;transform: label '$loop3' is at address a\n&quot;</span>
+<span id="L287" class="LineNr">287 </span>      <span class="Comment">// first jump is to -7</span>
+<span id="L288" class="LineNr">288 </span>      <span class="Constant">&quot;transform: instruction after transform: 'eb f9'\n&quot;</span>
+<span id="L289" class="LineNr">289 </span>      <span class="Comment">// second jump is to 0 (fall through)</span>
+<span id="L290" class="LineNr">290 </span>      <span class="Constant">&quot;transform: instruction after transform: 'eb 00'\n&quot;</span>
+<span id="L291" class="LineNr">291 </span>  <span class="Delimiter">);</span>
+<span id="L292" class="LineNr">292 </span><span class="Delimiter">}</span>
 <span id="L293" class="LineNr">293 </span>
-<span id="L294" class="LineNr">294 </span><span class="Comment">//: now that we have labels, we need to adjust segment size computation to</span>
-<span id="L295" class="LineNr">295 </span><span class="Comment">//: ignore them.</span>
-<span id="L296" class="LineNr">296 </span>
-<span id="L297" class="LineNr">297 </span><span class="Delimiter">:(scenario segment_size_ignores_labels)</span>
-<span id="L298" class="LineNr">298 </span>== <a href='031check_operands.cc.html#L11'>code</a>  <span class="Comment"># 0x09000074</span>
-<span id="L299" class="LineNr">299 </span>  <span class="PreProc">0</span><span class="Constant">5</span>/add  <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># 5 bytes</span>
-<span id="L300" class="LineNr">300 </span><span class="Normal">foo</span>:                      <span class="Comment"># 0 bytes</span>
-<span id="L301" class="LineNr">301 </span>== data  <span class="Comment"># 0x0a000079</span>
-<span id="L302" class="LineNr">302 </span><span class="Normal">bar</span>:
-<span id="L303" class="LineNr">303 </span>  <span class="PreProc">0</span><span class="Constant">0</span>
-<span id="L304" class="LineNr">304 </span><span class="traceContains">+transform: segment 1 begins at address 0x0a000079</span>
-<span id="L305" class="LineNr">305 </span>
-<span id="L306" class="LineNr">306 </span><span class="Delimiter">:(before &quot;End size_of(word w) Special-cases&quot;)</span>
-<span id="L307" class="LineNr">307 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='035labels.cc.html#L186'>is_label</a><span class="Delimiter">(</span>w<span class="Delimiter">))</span>
-<span id="L308" class="LineNr">308 </span>  <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L294" class="LineNr">294 </span><span class="Normal">void</span> <a href='035labels.cc.html#L294'>test_duplicate_label</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L295" class="LineNr">295 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L296" class="LineNr">296 </span>  transform<span class="Delimiter">(</span>
+<span id="L297" class="LineNr">297 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>
+<span id="L298" class="LineNr">298 </span>      <span class="Constant">&quot;loop:\n&quot;</span>
+<span id="L299" class="LineNr">299 </span>      <span class="Constant">&quot;loop:\n&quot;</span>
+<span id="L300" class="LineNr">300 </span>      <span class="Constant">&quot;    05  0x0d0c0b0a/imm32\n&quot;</span>
+<span id="L301" class="LineNr">301 </span>  <span class="Delimiter">);</span>
+<span id="L302" class="LineNr">302 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L303" class="LineNr">303 </span>      <span class="Constant">&quot;error: duplicate label 'loop'\n&quot;</span>
+<span id="L304" class="LineNr">304 </span>  <span class="Delimiter">);</span>
+<span id="L305" class="LineNr">305 </span><span class="Delimiter">}</span>
+<span id="L306" class="LineNr">306 </span>
+<span id="L307" class="LineNr">307 </span><span class="Normal">void</span> <a href='035labels.cc.html#L307'>test_label_too_short</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L308" class="LineNr">308 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L309" class="LineNr">309 </span>  transform<span class="Delimiter">(</span>
+<span id="L310" class="LineNr">310 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>
+<span id="L311" class="LineNr">311 </span>      <span class="Constant">&quot;xz:\n&quot;</span>
+<span id="L312" class="LineNr">312 </span>      <span class="Constant">&quot;  05  0x0d0c0b0a/imm32\n&quot;</span>
+<span id="L313" class="LineNr">313 </span>  <span class="Delimiter">);</span>
+<span id="L314" class="LineNr">314 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L315" class="LineNr">315 </span>      <span class="Constant">&quot;error: 'xz' is two characters long which can look like raw hex bytes at a glance; use a different name\n&quot;</span>
+<span id="L316" class="LineNr">316 </span>  <span class="Delimiter">);</span>
+<span id="L317" class="LineNr">317 </span><span class="Delimiter">}</span>
+<span id="L318" class="LineNr">318 </span>
+<span id="L319" class="LineNr">319 </span><span class="Normal">void</span> <a href='035labels.cc.html#L319'>test_label_hex</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L320" class="LineNr">320 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L321" class="LineNr">321 </span>  transform<span class="Delimiter">(</span>
+<span id="L322" class="LineNr">322 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>
+<span id="L323" class="LineNr">323 </span>      <span class="Constant">&quot;0xab:\n&quot;</span>
+<span id="L324" class="LineNr">324 </span>      <span class="Constant">&quot;  05  0x0d0c0b0a/imm32\n&quot;</span>
+<span id="L325" class="LineNr">325 </span>  <span class="Delimiter">);</span>
+<span id="L326" class="LineNr">326 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L327" class="LineNr">327 </span>      <span class="Constant">&quot;error: '0xab' looks like a hex number; use a different name\n&quot;</span>
+<span id="L328" class="LineNr">328 </span>  <span class="Delimiter">);</span>
+<span id="L329" class="LineNr">329 </span><span class="Delimiter">}</span>
+<span id="L330" class="LineNr">330 </span>
+<span id="L331" class="LineNr">331 </span><span class="Normal">void</span> <a href='035labels.cc.html#L331'>test_label_negative_hex</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L332" class="LineNr">332 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L333" class="LineNr">333 </span>  transform<span class="Delimiter">(</span>
+<span id="L334" class="LineNr">334 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>
+<span id="L335" class="LineNr">335 </span>      <span class="Constant">&quot;-a:\n&quot;</span>
+<span id="L336" class="LineNr">336 </span>      <span class="Constant">&quot;    05  0x0d0c0b0a/imm32\n&quot;</span>
+<span id="L337" class="LineNr">337 </span>  <span class="Delimiter">);</span>
+<span id="L338" class="LineNr">338 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L339" class="LineNr">339 </span>      <span class="Constant">&quot;error: '-a' starts with '-', which can be confused with a negative number; use a different name\n&quot;</span>
+<span id="L340" class="LineNr">340 </span>  <span class="Delimiter">);</span>
+<span id="L341" class="LineNr">341 </span><span class="Delimiter">}</span>
+<span id="L342" class="LineNr">342 </span>
+<span id="L343" class="LineNr">343 </span><span class="Comment">//: now that we have labels, we need to adjust segment size computation to</span>
+<span id="L344" class="LineNr">344 </span><span class="Comment">//: ignore them.</span>
+<span id="L345" class="LineNr">345 </span>
+<span id="L346" class="LineNr">346 </span><span class="Normal">void</span> <a href='035labels.cc.html#L346'>test_segment_size_ignores_labels</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L347" class="LineNr">347 </span>  transform<span class="Delimiter">(</span>
+<span id="L348" class="LineNr">348 </span>      <span class="Constant">&quot;== code\n&quot;</span>  <span class="Comment">// 0x09000074</span>
+<span id="L349" class="LineNr">349 </span>      <span class="Constant">&quot;  05/add  0x0d0c0b0a/imm32\n&quot;</span>  <span class="Comment">// 5 bytes</span>
+<span id="L350" class="LineNr">350 </span>      <span class="Constant">&quot;foo:\n&quot;</span>                        <span class="Comment">// 0 bytes</span>
+<span id="L351" class="LineNr">351 </span>      <span class="Constant">&quot;== data\n&quot;</span>  <span class="Comment">// 0x0a000079</span>
+<span id="L352" class="LineNr">352 </span>      <span class="Constant">&quot;bar:\n&quot;</span>
+<span id="L353" class="LineNr">353 </span>      <span class="Constant">&quot;  00\n&quot;</span>
+<span id="L354" class="LineNr">354 </span>  <span class="Delimiter">);</span>
+<span id="L355" class="LineNr">355 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L356" class="LineNr">356 </span>      <span class="Constant">&quot;transform: segment 1 begins at address 0x0a000079\n&quot;</span>
+<span id="L357" class="LineNr">357 </span>  <span class="Delimiter">);</span>
+<span id="L358" class="LineNr">358 </span><span class="Delimiter">}</span>
+<span id="L359" class="LineNr">359 </span>
+<span id="L360" class="LineNr">360 </span><span class="Delimiter">:(before &quot;End size_of(word w) Special-cases&quot;)</span>
+<span id="L361" class="LineNr">361 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='035labels.cc.html#L210'>is_label</a><span class="Delimiter">(</span>w<span class="Delimiter">))</span>
+<span id="L362" class="LineNr">362 </span>  <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/036global_variables.cc.html b/html/subx/036global_variables.cc.html
index eac4c776..bf9f80c8 100644
--- a/html/subx/036global_variables.cc.html
+++ b/html/subx/036global_variables.cc.html
@@ -14,18 +14,16 @@ pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-
 body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
-.traceContains { color: #005f00; }
 .CommentedCode { color: #8a8a8a; }
 .LineNr { }
 .Constant { color: #008787; }
+.SalientComment { color: #0000af; }
 .Delimiter { color: #c000c0; }
 .Special { color: #d70000; }
 .Identifier { color: #af5f00; }
 .Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 .Comment { color: #005faf; }
-.SalientComment { color: #0000af; }
-.PreProc { color: #c000c0; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
@@ -69,260 +67,295 @@ if ('onhashchange' in window) {
 <span id="L6" class="LineNr">  6 </span><span class="Comment">//:</span>
 <span id="L7" class="LineNr">  7 </span><span class="Comment">//: This layer has 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>== <a href='031check_operands.cc.html#L11'>code</a>
-<span id="L11" class="LineNr"> 11 </span>b9  x/imm32
-<span id="L12" class="LineNr"> 12 </span>== data
-<span id="L13" class="LineNr"> 13 </span><span class="Normal">x</span>:
-<span id="L14" class="LineNr"> 14 </span>  <span class="PreProc">0</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="L15" class="LineNr"> 15 </span><span class="traceContains">+transform: global variable 'x' is at address 0x0a000079</span>
-<span id="L16" class="LineNr"> 16 </span>
-<span id="L17" class="LineNr"> 17 </span><span class="Delimiter">:(before &quot;End Level-2 Transforms&quot;)</span>
-<span id="L18" class="LineNr"> 18 </span><span class="Special"><a href='011run.cc.html#L224'>Transform</a></span><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='036global_variables.cc.html#L20'>rewrite_global_variables</a><span class="Delimiter">);</span>
-<span id="L19" class="LineNr"> 19 </span><span class="Delimiter">:(code)</span>
-<span id="L20" class="LineNr"> 20 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L20'>rewrite_global_variables</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">3</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; end<span class="Delimiter">();</span>
-<span id="L22" class="LineNr"> 22 </span>  <span class="Comment">// Begin rewrite_global_variables</span>
-<span id="L23" class="LineNr"> 23 </span>  map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt; address<span class="Delimiter">;</span>
-<span id="L24" class="LineNr"> 24 </span>  compute_addresses_for_global_variables<span class="Delimiter">(</span>p<span class="Delimiter">,</span> address<span class="Delimiter">);</span>
-<span id="L25" class="LineNr"> 25 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L230'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L26" class="LineNr"> 26 </span>  <a href='036global_variables.cc.html#L65'>drop_global_variables</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
-<span id="L27" class="LineNr"> 27 </span>  <a href='036global_variables.cc.html#L70'>replace_global_variables_with_addresses</a><span class="Delimiter">(</span>p<span class="Delimiter">,</span> address<span class="Delimiter">);</span>
-<span id="L28" class="LineNr"> 28 </span><span class="Delimiter">}</span>
-<span id="L29" class="LineNr"> 29 </span>
-<span id="L30" class="LineNr"> 30 </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="L31" class="LineNr"> 31 </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#L11'>code</a> segment</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L32" class="LineNr"> 32 </span>    compute_addresses_for_global_variables<span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> address<span class="Delimiter">);</span>
-<span id="L33" class="LineNr"> 33 </span><span class="Delimiter">}</span>
-<span id="L34" class="LineNr"> 34 </span>
-<span id="L35" class="LineNr"> 35 </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="L36" class="LineNr"> 36 </span>  <span class="Normal">int</span> current_address = s<span class="Delimiter">.</span>start<span class="Delimiter">;</span>
-<span id="L37" class="LineNr"> 37 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L38" class="LineNr"> 38 </span>    <span class="Normal">const</span> line&amp; inst = s<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<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> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L40" class="LineNr"> 40 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
-<span id="L41" class="LineNr"> 41 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span>data<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> != <span class="Constant">':'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L42" class="LineNr"> 42 </span>        current_address += size_of<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
-<span id="L43" class="LineNr"> 43 </span>      <span class="Delimiter">}</span>
-<span id="L44" class="LineNr"> 44 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L45" class="LineNr"> 45 </span>        string variable = <a href='035labels.cc.html#L234'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L46" class="LineNr"> 46 </span>        <span class="Comment">// ensure variables look sufficiently different from raw hex</span>
-<span id="L47" class="LineNr"> 47 </span>        <a href='035labels.cc.html#L71'>check_valid_name</a><span class="Delimiter">(</span>variable<span class="Delimiter">);</span>
-<span id="L48" class="LineNr"> 48 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L230'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L49" class="LineNr"> 49 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>j &gt; <span class="Constant">0</span><span class="Delimiter">)</span>
-<span id="L50" class="LineNr"> 50 </span>          <a href='003trace.cc.html#L217'>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#L119'>word</a> in a line.\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L51" class="LineNr"> 51 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='035labels.cc.html#L163'>Map_file</a></span><span class="Delimiter">.</span>is_open<span class="Delimiter">())</span>
-<span id="L52" class="LineNr"> 52 </span>          <span class="Special"><a href='035labels.cc.html#L163'>Map_file</a></span> &lt;&lt; <span class="Constant">&quot;0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; current_address &lt;&lt; <span class="Constant">' '</span> &lt;&lt; variable &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L53" class="LineNr"> 53 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L256'>contains_key</a><span class="Delimiter">(</span>address<span class="Delimiter">,</span> variable<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L54" class="LineNr"> 54 </span>          <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;duplicate global '&quot;</span> &lt;&lt; variable &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L55" class="LineNr"> 55 </span>          <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L56" class="LineNr"> 56 </span>        <span class="Delimiter">}</span>
-<span id="L57" class="LineNr"> 57 </span>        <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span>address<span class="Delimiter">,</span> variable<span class="Delimiter">,</span> current_address<span class="Delimiter">);</span>
-<span id="L58" class="LineNr"> 58 </span>        <a href='003trace.cc.html#L98'>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#L433'>HEXWORD</a> &lt;&lt; current_address &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L59" class="LineNr"> 59 </span>        <span class="Comment">// no modifying current_address; global variable definitions won't be in the final binary</span>
-<span id="L60" class="LineNr"> 60 </span>      <span class="Delimiter">}</span>
-<span id="L61" class="LineNr"> 61 </span>    <span class="Delimiter">}</span>
-<span id="L62" class="LineNr"> 62 </span>  <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'>drop_global_variables</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L66" class="LineNr"> 66 </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#L11'>code</a> segment</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L67" class="LineNr"> 67 </span>    <a href='035labels.cc.html#L178'>drop_labels</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<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='036global_variables.cc.html#L70'>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="L71" class="LineNr"> 71 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L72" class="LineNr"> 72 </span>  <a href='036global_variables.cc.html#L77'>replace_global_variables_in_code_segment</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> address<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 = <span class="Comment">/*</span><span class="Comment">skip <a href='031check_operands.cc.html#L11'>code</a></span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L74" class="LineNr"> 74 </span>    <a href='036global_variables.cc.html#L100'>replace_global_variables_in_data_segment</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> address<span class="Delimiter">);</span>
-<span id="L75" class="LineNr"> 75 </span><span class="Delimiter">}</span>
-<span id="L76" class="LineNr"> 76 </span>
-<span id="L77" class="LineNr"> 77 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L77'>replace_global_variables_in_code_segment</a><span class="Delimiter">(</span>segment&amp; <a href='031check_operands.cc.html#L11'>code</a><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="L78" class="LineNr"> 78 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L79" class="LineNr"> 79 </span>    line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L80" class="LineNr"> 80 </span>    <a href='011run.cc.html#L113'>line</a> new_inst<span class="Delimiter">;</span>
-<span id="L81" class="LineNr"> 81 </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#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L82" class="LineNr"> 82 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
-<span id="L83" class="LineNr"> 83 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L84" class="LineNr"> 84 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>!looks_like_hex_int<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span>
-<span id="L85" class="LineNr"> 85 </span>          <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;missing reference to global '&quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L86" class="LineNr"> 86 </span>        new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
-<span id="L87" class="LineNr"> 87 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L88" class="LineNr"> 88 </span>      <span class="Delimiter">}</span>
-<span id="L89" class="LineNr"> 89 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!valid_use_of_global_variable<span class="Delimiter">(</span>curr<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L90" class="LineNr"> 90 </span>        <a href='003trace.cc.html#L217'>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;': can't refer to global variable '&quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L91" class="LineNr"> 91 </span>        <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L92" class="LineNr"> 92 </span>      <span class="Delimiter">}</span>
-<span id="L93" class="LineNr"> 93 </span>      emit_hex_bytes<span class="Delimiter">(</span>new_inst<span class="Delimiter">,</span> get<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">),</span> <span class="Constant">4</span><span class="Delimiter">);</span>
-<span id="L94" class="LineNr"> 94 </span>    <span class="Delimiter">}</span>
-<span id="L95" class="LineNr"> 95 </span>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">);</span>
-<span id="L96" class="LineNr"> 96 </span>    <a href='003trace.cc.html#L98'>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#L227'>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; end<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='036global_variables.cc.html#L100'>replace_global_variables_in_data_segment</a><span class="Delimiter">(</span>segment&amp; data<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="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#L166'>SIZE</a><span class="Delimiter">(</span>data<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L102" class="LineNr">102 </span>    line&amp; l = data<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L103" class="LineNr">103 </span>    <a href='011run.cc.html#L113'>line</a> new_l<span class="Delimiter">;</span>
-<span id="L104" class="LineNr">104 </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#L166'>SIZE</a><span class="Delimiter">(</span>l<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L105" class="LineNr">105 </span>      <span class="Normal">const</span> word&amp; curr = l<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
-<span id="L106" class="LineNr">106 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L107" class="LineNr">107 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L439'>looks_like_hex_int</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L108" class="LineNr">108 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">))</span>
-<span id="L109" class="LineNr">109 </span>            emit_hex_bytes<span class="Delimiter">(</span>new_l<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> <span class="Constant">4</span><span class="Delimiter">);</span>
-<span id="L110" class="LineNr">110 </span>          <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm16&quot;</span><span class="Delimiter">))</span>
-<span id="L111" class="LineNr">111 </span>            emit_hex_bytes<span class="Delimiter">(</span>new_l<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span>
-<span id="L112" class="LineNr">112 </span>          <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm8&quot;</span><span class="Delimiter">))</span>
-<span id="L113" class="LineNr">113 </span>            emit_hex_bytes<span class="Delimiter">(</span>new_l<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L114" class="LineNr">114 </span>          <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">))</span>
-<span id="L115" class="LineNr">115 </span>            <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;can't use /disp8 in a non-code segment\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L116" class="LineNr">116 </span>          <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">))</span>
-<span id="L117" class="LineNr">117 </span>            <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;can't use /disp16 in a non-code segment\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L118" class="LineNr">118 </span>          <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">))</span>
-<span id="L119" class="LineNr">119 </span>            <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;can't use /disp32 in a non-code segment\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L120" class="LineNr">120 </span>          <span class="Normal">else</span>
-<span id="L121" class="LineNr">121 </span>            new_l<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
-<span id="L122" class="LineNr">122 </span>        <span class="Delimiter">}</span>
-<span id="L123" class="LineNr">123 </span>        <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L124" class="LineNr">124 </span>          <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;missing reference to global '&quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L125" class="LineNr">125 </span>          new_l<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
-<span id="L126" class="LineNr">126 </span>        <span class="Delimiter">}</span>
-<span id="L127" class="LineNr">127 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L128" class="LineNr">128 </span>      <span class="Delimiter">}</span>
-<span id="L129" class="LineNr">129 </span>      <a href='003trace.cc.html#L98'>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; curr<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot; maps to &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; get<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L130" class="LineNr">130 </span>      emit_hex_bytes<span class="Delimiter">(</span>new_l<span class="Delimiter">,</span> get<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">),</span> <span class="Constant">4</span><span class="Delimiter">);</span>
-<span id="L131" class="LineNr">131 </span>    <span class="Delimiter">}</span>
-<span id="L132" class="LineNr">132 </span>    l<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_l<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">);</span>
-<span id="L133" class="LineNr">133 </span>    <a href='003trace.cc.html#L98'>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;after <a href='011run.cc.html#L227'>transform</a>: '&quot;</span> &lt;&lt; data_to_string<span class="Delimiter">(</span>l<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L134" class="LineNr">134 </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="Normal">bool</span> <a href='036global_variables.cc.html#L137'>valid_use_of_global_variable</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L138" class="LineNr">138 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L139" class="LineNr">139 </span>  <span class="Comment">// End Valid Uses Of Global Variable(curr)</span>
-<span id="L140" class="LineNr">140 </span>  <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L9" class="LineNr">  9 </span><span class="Delimiter">:(code)</span>
+<span id="L10" class="LineNr"> 10 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L10'>test_global_variable</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L11" class="LineNr"> 11 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L12" class="LineNr"> 12 </span>      <span class="Constant">&quot;== code\n&quot;</span>
+<span id="L13" class="LineNr"> 13 </span>      <span class="Constant">&quot;b9  x/imm32\n&quot;</span>
+<span id="L14" class="LineNr"> 14 </span>      <span class="Constant">&quot;== data\n&quot;</span>
+<span id="L15" class="LineNr"> 15 </span>      <span class="Constant">&quot;x:\n&quot;</span>
+<span id="L16" class="LineNr"> 16 </span>      <span class="Constant">&quot;  00 00 00 00\n&quot;</span>
+<span id="L17" class="LineNr"> 17 </span>  <span class="Delimiter">);</span>
+<span id="L18" class="LineNr"> 18 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L19" class="LineNr"> 19 </span>      <span class="Constant">&quot;transform: global variable 'x' is at address 0x0a000079\n&quot;</span>
+<span id="L20" class="LineNr"> 20 </span>  <span class="Delimiter">);</span>
+<span id="L21" class="LineNr"> 21 </span><span class="Delimiter">}</span>
+<span id="L22" class="LineNr"> 22 </span>
+<span id="L23" class="LineNr"> 23 </span><span class="Delimiter">:(before &quot;End Level-2 Transforms&quot;)</span>
+<span id="L24" class="LineNr"> 24 </span><span class="Special"><a href='011run.cc.html#L235'>Transform</a></span><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='036global_variables.cc.html#L26'>rewrite_global_variables</a><span class="Delimiter">);</span>
+<span id="L25" class="LineNr"> 25 </span><span class="Delimiter">:(code)</span>
+<span id="L26" class="LineNr"> 26 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L26'>rewrite_global_variables</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L27" class="LineNr"> 27 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">3</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; end<span class="Delimiter">();</span>
+<span id="L28" class="LineNr"> 28 </span>  <span class="Comment">// Begin rewrite_global_variables</span>
+<span id="L29" class="LineNr"> 29 </span>  map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt; address<span class="Delimiter">;</span>
+<span id="L30" class="LineNr"> 30 </span>  compute_addresses_for_global_variables<span class="Delimiter">(</span>p<span class="Delimiter">,</span> address<span class="Delimiter">);</span>
+<span id="L31" class="LineNr"> 31 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L238'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L32" class="LineNr"> 32 </span>  <a href='036global_variables.cc.html#L71'>drop_global_variables</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
+<span id="L33" class="LineNr"> 33 </span>  <a href='036global_variables.cc.html#L76'>replace_global_variables_with_addresses</a><span class="Delimiter">(</span>p<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> 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="L37" class="LineNr"> 37 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip code segment</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L38" class="LineNr"> 38 </span>    compute_addresses_for_global_variables<span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> address<span class="Delimiter">);</span>
+<span id="L39" class="LineNr"> 39 </span><span class="Delimiter">}</span>
+<span id="L40" class="LineNr"> 40 </span>
+<span id="L41" class="LineNr"> 41 </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="L42" class="LineNr"> 42 </span>  <span class="Normal">int</span> current_address = s<span class="Delimiter">.</span>start<span class="Delimiter">;</span>
+<span id="L43" class="LineNr"> 43 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L44" class="LineNr"> 44 </span>    <span class="Normal">const</span> line&amp; inst = s<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L45" class="LineNr"> 45 </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#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L46" class="LineNr"> 46 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
+<span id="L47" class="LineNr"> 47 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span>data<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> != <span class="Constant">':'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L48" class="LineNr"> 48 </span>        current_address += size_of<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
+<span id="L49" class="LineNr"> 49 </span>      <span class="Delimiter">}</span>
+<span id="L50" class="LineNr"> 50 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L51" class="LineNr"> 51 </span>        string variable = <a href='035labels.cc.html#L258'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L52" class="LineNr"> 52 </span>        <span class="Comment">// ensure variables look sufficiently different from raw hex</span>
+<span id="L53" class="LineNr"> 53 </span>        <a href='035labels.cc.html#L90'>check_valid_name</a><span class="Delimiter">(</span>variable<span class="Delimiter">);</span>
+<span id="L54" class="LineNr"> 54 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L238'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L55" class="LineNr"> 55 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>j &gt; <span class="Constant">0</span><span class="Delimiter">)</span>
+<span id="L56" class="LineNr"> 56 </span>          <a href='003trace.cc.html#L202'>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#L126'>word</a> in a line.\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L57" class="LineNr"> 57 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='035labels.cc.html#L187'>Map_file</a></span><span class="Delimiter">.</span>is_open<span class="Delimiter">())</span>
+<span id="L58" class="LineNr"> 58 </span>          <span class="Special"><a href='035labels.cc.html#L187'>Map_file</a></span> &lt;&lt; <span class="Constant">&quot;0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; current_address &lt;&lt; <span class="Constant">' '</span> &lt;&lt; variable &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L59" class="LineNr"> 59 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L256'>contains_key</a><span class="Delimiter">(</span>address<span class="Delimiter">,</span> variable<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L60" class="LineNr"> 60 </span>          <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;duplicate global '&quot;</span> &lt;&lt; variable &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L61" class="LineNr"> 61 </span>          <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L62" class="LineNr"> 62 </span>        <span class="Delimiter">}</span>
+<span id="L63" class="LineNr"> 63 </span>        <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span>address<span class="Delimiter">,</span> variable<span class="Delimiter">,</span> current_address<span class="Delimiter">);</span>
+<span id="L64" class="LineNr"> 64 </span>        <a href='003trace.cc.html#L96'>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#L440'>HEXWORD</a> &lt;&lt; current_address &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L65" class="LineNr"> 65 </span>        <span class="Comment">// no modifying current_address; global variable definitions won't be in the final binary</span>
+<span id="L66" class="LineNr"> 66 </span>      <span class="Delimiter">}</span>
+<span id="L67" class="LineNr"> 67 </span>    <span class="Delimiter">}</span>
+<span id="L68" class="LineNr"> 68 </span>  <span class="Delimiter">}</span>
+<span id="L69" class="LineNr"> 69 </span><span class="Delimiter">}</span>
+<span id="L70" class="LineNr"> 70 </span>
+<span id="L71" class="LineNr"> 71 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L71'>drop_global_variables</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L72" class="LineNr"> 72 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip code segment</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L73" class="LineNr"> 73 </span>    <a href='035labels.cc.html#L202'>drop_labels</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L74" class="LineNr"> 74 </span><span class="Delimiter">}</span>
+<span id="L75" class="LineNr"> 75 </span>
+<span id="L76" class="LineNr"> 76 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L76'>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="L77" class="LineNr"> 77 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L78" class="LineNr"> 78 </span>  <a href='036global_variables.cc.html#L83'>replace_global_variables_in_code_segment</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> address<span class="Delimiter">);</span>
+<span id="L79" class="LineNr"> 79 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip code</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L80" class="LineNr"> 80 </span>    <a href='036global_variables.cc.html#L106'>replace_global_variables_in_data_segment</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> address<span class="Delimiter">);</span>
+<span id="L81" class="LineNr"> 81 </span><span class="Delimiter">}</span>
+<span id="L82" class="LineNr"> 82 </span>
+<span id="L83" class="LineNr"> 83 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L83'>replace_global_variables_in_code_segment</a><span class="Delimiter">(</span>segment&amp; code<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="L84" class="LineNr"> 84 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>code<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L85" class="LineNr"> 85 </span>    line&amp; inst = code<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L86" class="LineNr"> 86 </span>    <a href='011run.cc.html#L120'>line</a> new_inst<span class="Delimiter">;</span>
+<span id="L87" class="LineNr"> 87 </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#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L88" class="LineNr"> 88 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
+<span id="L89" class="LineNr"> 89 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L90" class="LineNr"> 90 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>!looks_like_hex_int<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span>
+<span id="L91" class="LineNr"> 91 </span>          <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;missing reference to global '&quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L92" class="LineNr"> 92 </span>        new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
+<span id="L93" class="LineNr"> 93 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L94" class="LineNr"> 94 </span>      <span class="Delimiter">}</span>
+<span id="L95" class="LineNr"> 95 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!valid_use_of_global_variable<span class="Delimiter">(</span>curr<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L96" class="LineNr"> 96 </span>        <a href='003trace.cc.html#L202'>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;': can't refer to global variable '&quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'\n&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>      emit_hex_bytes<span class="Delimiter">(</span>new_inst<span class="Delimiter">,</span> get<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">),</span> <span class="Constant">4</span><span class="Delimiter">);</span>
+<span id="L100" class="LineNr">100 </span>    <span class="Delimiter">}</span>
+<span id="L101" class="LineNr">101 </span>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">);</span>
+<span id="L102" class="LineNr">102 </span>    <a href='003trace.cc.html#L96'>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 transform: '&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; end<span class="Delimiter">();</span>
+<span id="L103" class="LineNr">103 </span>  <span class="Delimiter">}</span>
+<span id="L104" class="LineNr">104 </span><span class="Delimiter">}</span>
+<span id="L105" class="LineNr">105 </span>
+<span id="L106" class="LineNr">106 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L106'>replace_global_variables_in_data_segment</a><span class="Delimiter">(</span>segment&amp; data<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="L107" class="LineNr">107 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>data<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L108" class="LineNr">108 </span>    line&amp; l = data<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L109" class="LineNr">109 </span>    <a href='011run.cc.html#L120'>line</a> new_l<span class="Delimiter">;</span>
+<span id="L110" class="LineNr">110 </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#L166'>SIZE</a><span class="Delimiter">(</span>l<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L111" class="LineNr">111 </span>      <span class="Normal">const</span> word&amp; curr = l<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
+<span id="L112" class="LineNr">112 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L113" class="LineNr">113 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L476'>looks_like_hex_int</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L114" class="LineNr">114 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">))</span>
+<span id="L115" class="LineNr">115 </span>            emit_hex_bytes<span class="Delimiter">(</span>new_l<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> <span class="Constant">4</span><span class="Delimiter">);</span>
+<span id="L116" class="LineNr">116 </span>          <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm16&quot;</span><span class="Delimiter">))</span>
+<span id="L117" class="LineNr">117 </span>            emit_hex_bytes<span class="Delimiter">(</span>new_l<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span>
+<span id="L118" class="LineNr">118 </span>          <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm8&quot;</span><span class="Delimiter">))</span>
+<span id="L119" class="LineNr">119 </span>            emit_hex_bytes<span class="Delimiter">(</span>new_l<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L120" class="LineNr">120 </span>          <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">))</span>
+<span id="L121" class="LineNr">121 </span>            <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;can't use /disp8 in a non-code segment\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L122" class="LineNr">122 </span>          <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">))</span>
+<span id="L123" class="LineNr">123 </span>            <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;can't use /disp16 in a non-code segment\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L124" class="LineNr">124 </span>          <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">))</span>
+<span id="L125" class="LineNr">125 </span>            <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;can't use /disp32 in a non-code segment\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L126" class="LineNr">126 </span>          <span class="Normal">else</span>
+<span id="L127" class="LineNr">127 </span>            new_l<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
+<span id="L128" class="LineNr">128 </span>        <span class="Delimiter">}</span>
+<span id="L129" class="LineNr">129 </span>        <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L130" class="LineNr">130 </span>          <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;missing reference to global '&quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L131" class="LineNr">131 </span>          new_l<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
+<span id="L132" class="LineNr">132 </span>        <span class="Delimiter">}</span>
+<span id="L133" class="LineNr">133 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L134" class="LineNr">134 </span>      <span class="Delimiter">}</span>
+<span id="L135" class="LineNr">135 </span>      <a href='003trace.cc.html#L96'>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; curr<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot; maps to &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; get<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L136" class="LineNr">136 </span>      emit_hex_bytes<span class="Delimiter">(</span>new_l<span class="Delimiter">,</span> get<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">),</span> <span class="Constant">4</span><span class="Delimiter">);</span>
+<span id="L137" class="LineNr">137 </span>    <span class="Delimiter">}</span>
+<span id="L138" class="LineNr">138 </span>    l<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_l<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">);</span>
+<span id="L139" class="LineNr">139 </span>    <a href='003trace.cc.html#L96'>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;after transform: '&quot;</span> &lt;&lt; data_to_string<span class="Delimiter">(</span>l<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<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>
-<span id="L143" class="LineNr">143 </span><span class="SalientComment">//:: a more complex sanity check for how we use global variables</span>
-<span id="L144" class="LineNr">144 </span><span class="Comment">//: requires first saving some data early before we pack operands</span>
-<span id="L145" class="LineNr">145 </span>
-<span id="L146" class="LineNr">146 </span><span class="Delimiter">:(after &quot;Begin Level-2 Transforms&quot;)</span>
-<span id="L147" class="LineNr">147 </span><span class="Special"><a href='011run.cc.html#L224'>Transform</a></span><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='036global_variables.cc.html#L149'>correlate_disp32_with_mod</a><span class="Delimiter">);</span>
-<span id="L148" class="LineNr">148 </span><span class="Delimiter">:(code)</span>
-<span id="L149" class="LineNr">149 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L149'>correlate_disp32_with_mod</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L150" class="LineNr">150 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L151" class="LineNr">151 </span>  segment&amp; <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L152" class="LineNr">152 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L153" class="LineNr">153 </span>    line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<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> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L155" class="LineNr">155 </span>      word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
-<span id="L156" class="LineNr">156 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">)</span>
-<span id="L157" class="LineNr">157 </span>          &amp;&amp; has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">))</span>
-<span id="L158" class="LineNr">158 </span>        curr<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><span class="Constant">&quot;has_mod&quot;</span><span class="Delimiter">);</span>
-<span id="L159" class="LineNr">159 </span>    <span class="Delimiter">}</span>
-<span id="L160" class="LineNr">160 </span>  <span class="Delimiter">}</span>
-<span id="L161" class="LineNr">161 </span><span class="Delimiter">}</span>
-<span id="L162" class="LineNr">162 </span>
-<span id="L163" class="LineNr">163 </span><span class="Delimiter">:(before &quot;End Valid Uses Of Global Variable(curr)&quot;)</span>
-<span id="L164" class="LineNr">164 </span><span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">))</span>
-<span id="L165" class="LineNr">165 </span>  <span class="Identifier">return</span> <a href='036global_variables.cc.html#L170'>has_metadata</a><span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;has_mod&quot;</span><span class="Delimiter">);</span>
-<span id="L166" class="LineNr">166 </span><span class="Comment">// todo: more sophisticated check, to ensure we don't use global variable</span>
-<span id="L167" class="LineNr">167 </span><span class="Comment">// addresses as a real displacement added to other operands.</span>
+<span id="L143" class="LineNr">143 </span><span class="Normal">bool</span> <a href='036global_variables.cc.html#L143'>valid_use_of_global_variable</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L144" class="LineNr">144 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L145" class="LineNr">145 </span>  <span class="Comment">// End Valid Uses Of Global Variable(curr)</span>
+<span id="L146" class="LineNr">146 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L147" class="LineNr">147 </span><span class="Delimiter">}</span>
+<span id="L148" class="LineNr">148 </span>
+<span id="L149" class="LineNr">149 </span><span class="SalientComment">//:: a more complex sanity check for how we use global variables</span>
+<span id="L150" class="LineNr">150 </span><span class="Comment">//: requires first saving some data early before we pack operands</span>
+<span id="L151" class="LineNr">151 </span>
+<span id="L152" class="LineNr">152 </span><span class="Delimiter">:(after &quot;Begin Level-2 Transforms&quot;)</span>
+<span id="L153" class="LineNr">153 </span><span class="Special"><a href='011run.cc.html#L235'>Transform</a></span><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='036global_variables.cc.html#L155'>correlate_disp32_with_mod</a><span class="Delimiter">);</span>
+<span id="L154" class="LineNr">154 </span><span class="Delimiter">:(code)</span>
+<span id="L155" class="LineNr">155 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L155'>correlate_disp32_with_mod</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L156" class="LineNr">156 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L157" class="LineNr">157 </span>  segment&amp; code = p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L158" class="LineNr">158 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>code<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L159" class="LineNr">159 </span>    line&amp; inst = code<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L160" class="LineNr">160 </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#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L161" class="LineNr">161 </span>      word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
+<span id="L162" class="LineNr">162 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">)</span>
+<span id="L163" class="LineNr">163 </span>          &amp;&amp; has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">))</span>
+<span id="L164" class="LineNr">164 </span>        curr<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><span class="Constant">&quot;has_mod&quot;</span><span class="Delimiter">);</span>
+<span id="L165" class="LineNr">165 </span>    <span class="Delimiter">}</span>
+<span id="L166" class="LineNr">166 </span>  <span class="Delimiter">}</span>
+<span id="L167" class="LineNr">167 </span><span class="Delimiter">}</span>
 <span id="L168" class="LineNr">168 </span>
-<span id="L169" class="LineNr">169 </span><span class="Delimiter">:(code)</span>
-<span id="L170" class="LineNr">170 </span><span class="Normal">bool</span> <a href='036global_variables.cc.html#L170'>has_metadata</a><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="L171" class="LineNr">171 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L172" class="LineNr">172 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> == m<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L173" class="LineNr">173 </span>  <span class="Identifier">return</span><span class="Constant"> false</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="Delimiter">:(scenario global_variable_disallowed_in_jump)</span>
-<span id="L177" class="LineNr">177 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L178" class="LineNr">178 </span>== <a href='031check_operands.cc.html#L11'>code</a>
-<span id="L179" class="LineNr">179 </span>eb/jump  x/disp8
-<span id="L180" class="LineNr">180 </span>== data
-<span id="L181" class="LineNr">181 </span><span class="Normal">x</span>:
-<span id="L182" class="LineNr">182 </span>  <span class="PreProc">0</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="L183" class="LineNr">183 </span><span class="traceContains">+error: 'eb/jump x/disp8': can't refer to global variable 'x'</span>
-<span id="L184" class="LineNr">184 </span><span class="Comment"># sub-optimal error message; should be</span>
-<span id="L185" class="LineNr">185 </span><span class="CommentedCode">#? +error: can't jump to data (variable 'x')</span>
-<span id="L186" class="LineNr">186 </span>
-<span id="L187" class="LineNr">187 </span><span class="Delimiter">:(scenario global_variable_disallowed_in_call)</span>
-<span id="L188" class="LineNr">188 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L189" class="LineNr">189 </span>== <a href='031check_operands.cc.html#L11'>code</a>
-<span id="L190" class="LineNr">190 </span>e8/call  x/disp32
-<span id="L191" class="LineNr">191 </span>== data
-<span id="L192" class="LineNr">192 </span><span class="Normal">x</span>:
-<span id="L193" class="LineNr">193 </span>  <span class="PreProc">0</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="L194" class="LineNr">194 </span><span class="traceContains">+error: 'e8/call x/disp32': can't refer to global variable 'x'</span>
-<span id="L195" class="LineNr">195 </span><span class="Comment"># sub-optimal error message; should be</span>
-<span id="L196" class="LineNr">196 </span><span class="CommentedCode">#? +error: can't call to the data segment ('x')</span>
+<span id="L169" class="LineNr">169 </span><span class="Delimiter">:(before &quot;End Valid Uses Of Global Variable(curr)&quot;)</span>
+<span id="L170" class="LineNr">170 </span><span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">))</span>
+<span id="L171" class="LineNr">171 </span>  <span class="Identifier">return</span> <a href='036global_variables.cc.html#L176'>has_metadata</a><span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;has_mod&quot;</span><span class="Delimiter">);</span>
+<span id="L172" class="LineNr">172 </span><span class="Comment">// todo: more sophisticated check, to ensure we don't use global variable</span>
+<span id="L173" class="LineNr">173 </span><span class="Comment">// addresses as a real displacement added to other operands.</span>
+<span id="L174" class="LineNr">174 </span>
+<span id="L175" class="LineNr">175 </span><span class="Delimiter">:(code)</span>
+<span id="L176" class="LineNr">176 </span><span class="Normal">bool</span> <a href='036global_variables.cc.html#L176'>has_metadata</a><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="L177" class="LineNr">177 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L178" class="LineNr">178 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> == m<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L179" class="LineNr">179 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L180" class="LineNr">180 </span><span class="Delimiter">}</span>
+<span id="L181" class="LineNr">181 </span>
+<span id="L182" class="LineNr">182 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L182'>test_global_variable_disallowed_in_jump</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L183" class="LineNr">183 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L184" class="LineNr">184 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L185" class="LineNr">185 </span>      <span class="Constant">&quot;== code\n&quot;</span>
+<span id="L186" class="LineNr">186 </span>      <span class="Constant">&quot;eb/jump  x/disp8\n&quot;</span>
+<span id="L187" class="LineNr">187 </span>      <span class="Constant">&quot;== data\n&quot;</span>
+<span id="L188" class="LineNr">188 </span>      <span class="Constant">&quot;x:\n&quot;</span>
+<span id="L189" class="LineNr">189 </span>      <span class="Constant">&quot;  00 00 00 00\n&quot;</span>
+<span id="L190" class="LineNr">190 </span>  <span class="Delimiter">);</span>
+<span id="L191" class="LineNr">191 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L192" class="LineNr">192 </span>      <span class="Constant">&quot;error: 'eb/jump x/disp8': can't refer to global variable 'x'\n&quot;</span>
+<span id="L193" class="LineNr">193 </span>      <span class="Comment">// sub-optimal error message; should be</span>
+<span id="L194" class="LineNr">194 </span><span class="CommentedCode">//?       &quot;error: can't jump to data (variable 'x')\n&quot;</span>
+<span id="L195" class="LineNr">195 </span>  <span class="Delimiter">);</span>
+<span id="L196" class="LineNr">196 </span><span class="Delimiter">}</span>
 <span id="L197" class="LineNr">197 </span>
-<span id="L198" class="LineNr">198 </span><span class="Delimiter">:(scenario global_variable_in_data_segment)</span>
-<span id="L199" class="LineNr">199 </span>== <span class="Constant">0x1</span>
-<span id="L200" class="LineNr">200 </span>b9  x/imm32
-<span id="L201" class="LineNr">201 </span>== <span class="Constant">0x0a000000</span>
-<span id="L202" class="LineNr">202 </span><span class="Normal">x</span>:
-<span id="L203" class="LineNr">203 </span>  y/imm32
-<span id="L204" class="LineNr">204 </span><span class="Normal">y</span>:
-<span id="L205" class="LineNr">205 </span>  <span class="PreProc">0</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="L206" class="LineNr">206 </span><span class="Comment"># check that we loaded 'x' with the address of 'y'</span>
-<span id="L207" class="LineNr">207 </span><span class="traceContains">+load: 0x0a000000 -&gt; 04</span>
-<span id="L208" class="LineNr">208 </span><span class="traceContains">+load: 0x0a000001 -&gt; 00</span>
-<span id="L209" class="LineNr">209 </span><span class="traceContains">+load: 0x0a000002 -&gt; 00</span>
-<span id="L210" class="LineNr">210 </span><span class="traceContains">+load: 0x0a000003 -&gt; 0a</span>
-<span id="L211" class="LineNr">211 </span>$error: <span class="Constant">0</span>
-<span id="L212" class="LineNr">212 </span>
-<span id="L213" class="LineNr">213 </span><span class="Delimiter">:(scenario raw_number_with_imm32_in_data_segment)</span>
-<span id="L214" class="LineNr">214 </span>== <span class="Constant">0x1</span>
-<span id="L215" class="LineNr">215 </span>b9  x/imm32
-<span id="L216" class="LineNr">216 </span>== <span class="Constant">0x0a000000</span>
-<span id="L217" class="LineNr">217 </span><span class="Normal">x</span>:
-<span id="L218" class="LineNr">218 </span>  <span class="Constant">1</span>/imm32
-<span id="L219" class="LineNr">219 </span><span class="Comment"># check that we loaded 'x' with the address of 1</span>
-<span id="L220" class="LineNr">220 </span><span class="traceContains">+load: 0x0a000000 -&gt; 01</span>
-<span id="L221" class="LineNr">221 </span><span class="traceContains">+load: 0x0a000001 -&gt; 00</span>
-<span id="L222" class="LineNr">222 </span><span class="traceContains">+load: 0x0a000002 -&gt; 00</span>
-<span id="L223" class="LineNr">223 </span><span class="traceContains">+load: 0x0a000003 -&gt; 00</span>
-<span id="L224" class="LineNr">224 </span>$error: <span class="Constant">0</span>
-<span id="L225" class="LineNr">225 </span>
-<span id="L226" class="LineNr">226 </span><span class="Delimiter">:(scenario duplicate_global_variable)</span>
-<span id="L227" class="LineNr">227 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L228" class="LineNr">228 </span>== <span class="Constant">0x1</span>
-<span id="L229" class="LineNr">229 </span><span class="Constant">40</span>/increment-EAX
-<span id="L230" class="LineNr">230 </span>== <span class="Constant">0x0a000000</span>
-<span id="L231" class="LineNr">231 </span><span class="Normal">x</span>:
-<span id="L232" class="LineNr">232 </span><span class="Normal">x</span>:
-<span id="L233" class="LineNr">233 </span>  <span class="PreProc">0</span><span class="Constant">0</span>
-<span id="L234" class="LineNr">234 </span><span class="traceContains">+error: duplicate global 'x'</span>
-<span id="L235" class="LineNr">235 </span>
-<span id="L236" class="LineNr">236 </span><span class="Delimiter">:(scenario global_variable_disp32_with_modrm)</span>
-<span id="L237" class="LineNr">237 </span>== <a href='031check_operands.cc.html#L11'>code</a>
-<span id="L238" class="LineNr">238 </span>8b/copy <span class="Constant">0</span>/mod/indirect <span class="Constant">5</span>/rm32/<span class="Delimiter">.</span>disp32 <span class="Constant">2</span>/r32/EDX x/disp32
-<span id="L239" class="LineNr">239 </span>== data
-<span id="L240" class="LineNr">240 </span><span class="Normal">x</span>:
-<span id="L241" class="LineNr">241 </span>  <span class="PreProc">0</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="L242" class="LineNr">242 </span>$error: <span class="Constant">0</span>
-<span id="L243" class="LineNr">243 </span>
-<span id="L244" class="LineNr">244 </span><span class="Delimiter">:(scenarios transform)</span>
-<span id="L245" class="LineNr">245 </span><span class="Delimiter">:(scenario global_variable_disp32_with_call)</span>
-<span id="L246" class="LineNr">246 </span>== <a href='031check_operands.cc.html#L11'>code</a>
-<span id="L247" class="LineNr">247 </span><span class="Normal">foo</span>:
-<span id="L248" class="LineNr">248 </span>  e8/call bar/disp32
-<span id="L249" class="LineNr">249 </span><span class="Normal">bar</span>:
-<span id="L250" class="LineNr">250 </span>$error: <span class="Constant">0</span>
+<span id="L198" class="LineNr">198 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L198'>test_global_variable_disallowed_in_call</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L199" class="LineNr">199 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L200" class="LineNr">200 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L201" class="LineNr">201 </span>      <span class="Constant">&quot;== code\n&quot;</span>
+<span id="L202" class="LineNr">202 </span>      <span class="Constant">&quot;e8/call  x/disp32\n&quot;</span>
+<span id="L203" class="LineNr">203 </span>      <span class="Constant">&quot;== data\n&quot;</span>
+<span id="L204" class="LineNr">204 </span>      <span class="Constant">&quot;x:\n&quot;</span>
+<span id="L205" class="LineNr">205 </span>      <span class="Constant">&quot;  00 00 00 00\n&quot;</span>
+<span id="L206" class="LineNr">206 </span>  <span class="Delimiter">);</span>
+<span id="L207" class="LineNr">207 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L208" class="LineNr">208 </span>      <span class="Constant">&quot;error: 'e8/call x/disp32': can't refer to global variable 'x'\n&quot;</span>
+<span id="L209" class="LineNr">209 </span>      <span class="Comment">// sub-optimal error message; should be</span>
+<span id="L210" class="LineNr">210 </span><span class="CommentedCode">//?       &quot;error: can't call to the data segment ('x')\n&quot;</span>
+<span id="L211" class="LineNr">211 </span>  <span class="Delimiter">);</span>
+<span id="L212" class="LineNr">212 </span><span class="Delimiter">}</span>
+<span id="L213" class="LineNr">213 </span>
+<span id="L214" class="LineNr">214 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L214'>test_global_variable_in_data_segment</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L215" class="LineNr">215 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L216" class="LineNr">216 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>
+<span id="L217" class="LineNr">217 </span>      <span class="Constant">&quot;b9  x/imm32\n&quot;</span>
+<span id="L218" class="LineNr">218 </span>      <span class="Constant">&quot;== 0x0a000000\n&quot;</span>
+<span id="L219" class="LineNr">219 </span>      <span class="Constant">&quot;x:\n&quot;</span>
+<span id="L220" class="LineNr">220 </span>      <span class="Constant">&quot;  y/imm32\n&quot;</span>
+<span id="L221" class="LineNr">221 </span>      <span class="Constant">&quot;y:\n&quot;</span>
+<span id="L222" class="LineNr">222 </span>      <span class="Constant">&quot;  00 00 00 00\n&quot;</span>
+<span id="L223" class="LineNr">223 </span>  <span class="Delimiter">);</span>
+<span id="L224" class="LineNr">224 </span>  <span class="Comment">// check that we loaded 'x' with the address of 'y'</span>
+<span id="L225" class="LineNr">225 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L226" class="LineNr">226 </span>      <span class="Constant">&quot;load: 0x0a000000 -&gt; 04\n&quot;</span>
+<span id="L227" class="LineNr">227 </span>      <span class="Constant">&quot;load: 0x0a000001 -&gt; 00\n&quot;</span>
+<span id="L228" class="LineNr">228 </span>      <span class="Constant">&quot;load: 0x0a000002 -&gt; 00\n&quot;</span>
+<span id="L229" class="LineNr">229 </span>      <span class="Constant">&quot;load: 0x0a000003 -&gt; 0a\n&quot;</span>
+<span id="L230" class="LineNr">230 </span>  <span class="Delimiter">);</span>
+<span id="L231" class="LineNr">231 </span>  <a href='003trace.cc.html#L270'>CHECK_TRACE_COUNT</a><span class="Delimiter">(</span><span class="Constant">&quot;error&quot;</span><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L232" class="LineNr">232 </span><span class="Delimiter">}</span>
+<span id="L233" class="LineNr">233 </span>
+<span id="L234" class="LineNr">234 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L234'>test_raw_number_with_imm32_in_data_segment</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L235" class="LineNr">235 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L236" class="LineNr">236 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>
+<span id="L237" class="LineNr">237 </span>      <span class="Constant">&quot;b9  x/imm32\n&quot;</span>
+<span id="L238" class="LineNr">238 </span>      <span class="Constant">&quot;== 0x0a000000\n&quot;</span>
+<span id="L239" class="LineNr">239 </span>      <span class="Constant">&quot;x:\n&quot;</span>
+<span id="L240" class="LineNr">240 </span>      <span class="Constant">&quot;  1/imm32\n&quot;</span>
+<span id="L241" class="LineNr">241 </span>  <span class="Delimiter">);</span>
+<span id="L242" class="LineNr">242 </span>  <span class="Comment">// check that we loaded 'x' with the address of 1</span>
+<span id="L243" class="LineNr">243 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L244" class="LineNr">244 </span>      <span class="Constant">&quot;load: 0x0a000000 -&gt; 01\n&quot;</span>
+<span id="L245" class="LineNr">245 </span>      <span class="Constant">&quot;load: 0x0a000001 -&gt; 00\n&quot;</span>
+<span id="L246" class="LineNr">246 </span>      <span class="Constant">&quot;load: 0x0a000002 -&gt; 00\n&quot;</span>
+<span id="L247" class="LineNr">247 </span>      <span class="Constant">&quot;load: 0x0a000003 -&gt; 00\n&quot;</span>
+<span id="L248" class="LineNr">248 </span>  <span class="Delimiter">);</span>
+<span id="L249" class="LineNr">249 </span>  <a href='003trace.cc.html#L270'>CHECK_TRACE_COUNT</a><span class="Delimiter">(</span><span class="Constant">&quot;error&quot;</span><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L250" class="LineNr">250 </span><span class="Delimiter">}</span>
 <span id="L251" class="LineNr">251 </span>
-<span id="L252" class="LineNr">252 </span><span class="Delimiter">:(code)</span>
-<span id="L253" class="LineNr">253 </span>string to_full_string<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L254" class="LineNr">254 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L255" class="LineNr">255 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L256" class="LineNr">256 </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="L257" class="LineNr">257 </span>    out &lt;&lt; in<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>data<span class="Delimiter">;</span>
-<span id="L258" class="LineNr">258 </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#L166'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>metadata<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
-<span id="L259" class="LineNr">259 </span>      out &lt;&lt; <span class="Constant">'/'</span> &lt;&lt; in<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
-<span id="L260" class="LineNr">260 </span>  <span class="Delimiter">}</span>
-<span id="L261" class="LineNr">261 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L262" class="LineNr">262 </span><span class="Delimiter">}</span>
+<span id="L252" class="LineNr">252 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L252'>test_duplicate_global_variable</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L253" class="LineNr">253 </span>  <span class="Special">Hide_errors</span> = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L254" class="LineNr">254 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L255" class="LineNr">255 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>
+<span id="L256" class="LineNr">256 </span>      <span class="Constant">&quot;40/increment-EAX\n&quot;</span>
+<span id="L257" class="LineNr">257 </span>      <span class="Constant">&quot;== 0x0a000000\n&quot;</span>
+<span id="L258" class="LineNr">258 </span>      <span class="Constant">&quot;x:\n&quot;</span>
+<span id="L259" class="LineNr">259 </span>      <span class="Constant">&quot;x:\n&quot;</span>
+<span id="L260" class="LineNr">260 </span>      <span class="Constant">&quot;  00\n&quot;</span>
+<span id="L261" class="LineNr">261 </span>  <span class="Delimiter">);</span>
+<span id="L262" class="LineNr">262 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L263" class="LineNr">263 </span>      <span class="Constant">&quot;error: duplicate global 'x'\n&quot;</span>
+<span id="L264" class="LineNr">264 </span>  <span class="Delimiter">);</span>
+<span id="L265" class="LineNr">265 </span><span class="Delimiter">}</span>
+<span id="L266" class="LineNr">266 </span>
+<span id="L267" class="LineNr">267 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L267'>test_global_variable_disp32_with_modrm</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L268" class="LineNr">268 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L269" class="LineNr">269 </span>      <span class="Constant">&quot;== code\n&quot;</span>
+<span id="L270" class="LineNr">270 </span>      <span class="Constant">&quot;8b/copy 0/mod/indirect 5/rm32/.disp32 2/r32/EDX x/disp32\n&quot;</span>
+<span id="L271" class="LineNr">271 </span>      <span class="Constant">&quot;== data\n&quot;</span>
+<span id="L272" class="LineNr">272 </span>      <span class="Constant">&quot;x:\n&quot;</span>
+<span id="L273" class="LineNr">273 </span>      <span class="Constant">&quot;  00 00 00 00\n&quot;</span>
+<span id="L274" class="LineNr">274 </span>  <span class="Delimiter">);</span>
+<span id="L275" class="LineNr">275 </span>  <a href='003trace.cc.html#L270'>CHECK_TRACE_COUNT</a><span class="Delimiter">(</span><span class="Constant">&quot;error&quot;</span><span class="Delimiter">,</span> <span class="Constant">0</span><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">void</span> <a href='036global_variables.cc.html#L278'>test_global_variable_disp32_with_call</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L279" class="LineNr">279 </span>  transform<span class="Delimiter">(</span>
+<span id="L280" class="LineNr">280 </span>      <span class="Constant">&quot;== code\n&quot;</span>
+<span id="L281" class="LineNr">281 </span>      <span class="Constant">&quot;foo:\n&quot;</span>
+<span id="L282" class="LineNr">282 </span>      <span class="Constant">&quot;  e8/call bar/disp32\n&quot;</span>
+<span id="L283" class="LineNr">283 </span>      <span class="Constant">&quot;bar:\n&quot;</span>
+<span id="L284" class="LineNr">284 </span>  <span class="Delimiter">);</span>
+<span id="L285" class="LineNr">285 </span>  <a href='003trace.cc.html#L270'>CHECK_TRACE_COUNT</a><span class="Delimiter">(</span><span class="Constant">&quot;error&quot;</span><span class="Delimiter">,</span> <span class="Constant">0</span><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>string <a href='036global_variables.cc.html#L288'>to_full_string</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L289" class="LineNr">289 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L290" class="LineNr">290 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L291" class="LineNr">291 </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="L292" class="LineNr">292 </span>    out &lt;&lt; in<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>data<span class="Delimiter">;</span>
+<span id="L293" class="LineNr">293 </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#L166'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>metadata<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
+<span id="L294" class="LineNr">294 </span>      out &lt;&lt; <span class="Constant">'/'</span> &lt;&lt; in<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
+<span id="L295" class="LineNr">295 </span>  <span class="Delimiter">}</span>
+<span id="L296" class="LineNr">296 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L297" class="LineNr">297 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/037heap.cc.html b/html/subx/037heap.cc.html
index 3206e8fc..7065f55b 100644
--- a/html/subx/037heap.cc.html
+++ b/html/subx/037heap.cc.html
@@ -64,24 +64,24 @@ if ('onhashchange' in window) {
 <span id="L7" class="LineNr"> 7 </span><a href='037heap.cc.html#L9'>insert_heap_global_variable</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
 <span id="L8" class="LineNr"> 8 </span><span class="Delimiter">:(code)</span>
 <span id="L9" class="LineNr"> 9 </span><span class="Normal">void</span> <a href='037heap.cc.html#L9'>insert_heap_global_variable</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L10" class="LineNr">10 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">)</span> &lt; <span class="Constant">2</span><span class="Delimiter">)</span>
+<span id="L10" class="LineNr">10 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">)</span> &lt; <span class="Constant">2</span><span class="Delimiter">)</span>
 <span id="L11" class="LineNr">11 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// no data segment defined</span>
 <span id="L12" class="LineNr">12 </span>  <span class="Comment">// Start-of-heap:</span>
-<span id="L13" class="LineNr">13 </span>  p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>label<span class="Delimiter">(</span><span class="Constant">&quot;Start-of-heap&quot;</span><span class="Delimiter">));</span>
+<span id="L13" class="LineNr">13 </span>  p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>label<span class="Delimiter">(</span><span class="Constant">&quot;Start-of-heap&quot;</span><span class="Delimiter">));</span>
 <span id="L14" class="LineNr">14 </span><span class="Delimiter">}</span>
 <span id="L15" class="LineNr">15 </span>
-<span id="L16" class="LineNr">16 </span><a href='011run.cc.html#L113'>line</a> label<span class="Delimiter">(</span>string s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L17" class="LineNr">17 </span>  <a href='011run.cc.html#L113'>line</a> result<span class="Delimiter">;</span>
-<span id="L18" class="LineNr">18 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L119'>word</a><span class="Delimiter">());</span>
-<span id="L19" class="LineNr">19 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = <span class="Delimiter">(</span>s+<span class="Constant">&quot;:&quot;</span><span class="Delimiter">);</span>
+<span id="L16" class="LineNr">16 </span><a href='011run.cc.html#L120'>line</a> label<span class="Delimiter">(</span>string s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L17" class="LineNr">17 </span>  <a href='011run.cc.html#L120'>line</a> result<span class="Delimiter">;</span>
+<span id="L18" class="LineNr">18 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L126'>word</a><span class="Delimiter">());</span>
+<span id="L19" class="LineNr">19 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = <span class="Delimiter">(</span>s+<span class="Constant">&quot;:&quot;</span><span class="Delimiter">);</span>
 <span id="L20" class="LineNr">20 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L21" class="LineNr">21 </span><span class="Delimiter">}</span>
 <span id="L22" class="LineNr">22 </span>
-<span id="L23" class="LineNr">23 </span><a href='011run.cc.html#L113'>line</a> <a href='037heap.cc.html#L23'>imm32</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L24" class="LineNr">24 </span>  <a href='011run.cc.html#L113'>line</a> result<span class="Delimiter">;</span>
-<span id="L25" class="LineNr">25 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L119'>word</a><span class="Delimiter">());</span>
-<span id="L26" class="LineNr">26 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = s<span class="Delimiter">;</span>
-<span id="L27" class="LineNr">27 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">);</span>
+<span id="L23" class="LineNr">23 </span><a href='011run.cc.html#L120'>line</a> <a href='037heap.cc.html#L23'>imm32</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L24" class="LineNr">24 </span>  <a href='011run.cc.html#L120'>line</a> result<span class="Delimiter">;</span>
+<span id="L25" class="LineNr">25 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L126'>word</a><span class="Delimiter">());</span>
+<span id="L26" class="LineNr">26 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = s<span class="Delimiter">;</span>
+<span id="L27" class="LineNr">27 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">);</span>
 <span id="L28" class="LineNr">28 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L29" class="LineNr">29 </span><span class="Delimiter">}</span>
 </pre>
diff --git a/html/subx/038---literal_strings.cc.html b/html/subx/038---literal_strings.cc.html
index 334544f8..1e49a96e 100644
--- a/html/subx/038---literal_strings.cc.html
+++ b/html/subx/038---literal_strings.cc.html
@@ -14,16 +14,14 @@ pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-
 body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
 .LineNr { }
-.traceAbsent { color: #c00000; }
 .Constant { color: #008787; }
 .Delimiter { color: #c000c0; }
 .Special { color: #d70000; }
 .Identifier { color: #af5f00; }
 .Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 .Comment { color: #005faf; }
-.traceContains { color: #005f00; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
@@ -64,236 +62,290 @@ if ('onhashchange' in window) {
 <span id="L3" class="LineNr">  3 </span><span class="Comment">//: This layer will transparently move them to the global segment (assumed to</span>
 <span id="L4" class="LineNr">  4 </span><span class="Comment">//: always be the second segment).</span>
 <span id="L5" class="LineNr">  5 </span>
-<span id="L6" class="LineNr">  6 </span><span class="Delimiter">:(scenario transform_literal_string)</span>
-<span id="L7" class="LineNr">  7 </span>== <a href='031check_operands.cc.html#L11'>code</a>
-<span id="L8" class="LineNr">  8 </span>b8/copy  <span class="Constant">&quot;test&quot;</span>/imm32
-<span id="L9" class="LineNr">  9 </span>== data  <span class="Comment"># need to manually create this for now</span>
-<span id="L10" class="LineNr"> 10 </span><span class="traceContains">+transform: -- move literal strings to data segment</span>
-<span id="L11" class="LineNr"> 11 </span><span class="traceContains">+transform: adding global variable '__subx_global_1' containing &quot;test&quot;</span>
-<span id="L12" class="LineNr"> 12 </span><span class="traceContains">+transform: instruction after <a href='011run.cc.html#L227'>transform</a>: 'b8 __subx_global_1'</span>
-<span id="L13" class="LineNr"> 13 </span>
-<span id="L14" class="LineNr"> 14 </span><span class="Comment">//: We don't rely on any transforms running in previous layers, but this layer</span>
-<span id="L15" class="LineNr"> 15 </span><span class="Comment">//: knows about labels and global variables and will emit them for previous</span>
-<span id="L16" class="LineNr"> 16 </span><span class="Comment">//: layers to transform.</span>
-<span id="L17" class="LineNr"> 17 </span><span class="Delimiter">:(after &quot;Begin Transforms&quot;)</span>
-<span id="L18" class="LineNr"> 18 </span><span class="Comment">// Begin Level-3 Transforms</span>
-<span id="L19" class="LineNr"> 19 </span><span class="Special"><a href='011run.cc.html#L224'>Transform</a></span><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='038---literal_strings.cc.html#L25'>transform_literal_strings</a><span class="Delimiter">);</span>
-<span id="L20" class="LineNr"> 20 </span><span class="Comment">// End Level-3 Transforms</span>
-<span id="L21" class="LineNr"> 21 </span>
-<span id="L22" class="LineNr"> 22 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L23" class="LineNr"> 23 </span><span class="Normal">int</span> <span class="Special"><a href='038---literal_strings.cc.html#L23'>Next_auto_global</a></span> = <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L24" class="LineNr"> 24 </span><span class="Delimiter">:(code)</span>
-<span id="L25" class="LineNr"> 25 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L25'>transform_literal_strings</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L26" class="LineNr"> 26 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- move literal strings to data segment&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L27" class="LineNr"> 27 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L28" class="LineNr"> 28 </span>  segment&amp; <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L29" class="LineNr"> 29 </span>  segment data<span class="Delimiter">;</span>
-<span id="L30" class="LineNr"> 30 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L31" class="LineNr"> 31 </span>    line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<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> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L33" class="LineNr"> 33 </span>      word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
-<span id="L34" class="LineNr"> 34 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> != <span class="Constant">'&quot;'</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L35" class="LineNr"> 35 </span>      ostringstream global_name<span class="Delimiter">;</span>
-<span id="L36" class="LineNr"> 36 </span>      global_name &lt;&lt; <span class="Constant">&quot;__subx_global_&quot;</span> &lt;&lt; <span class="Special"><a href='038---literal_strings.cc.html#L23'>Next_auto_global</a></span><span class="Delimiter">;</span>
-<span id="L37" class="LineNr"> 37 </span>      ++<span class="Special"><a href='038---literal_strings.cc.html#L23'>Next_auto_global</a></span><span class="Delimiter">;</span>
-<span id="L38" class="LineNr"> 38 </span>      <a href='038---literal_strings.cc.html#L52'>add_global_to_data_segment</a><span class="Delimiter">(</span>global_name<span class="Delimiter">.</span>str<span class="Delimiter">(),</span> curr<span class="Delimiter">,</span> data<span class="Delimiter">);</span>
-<span id="L39" class="LineNr"> 39 </span>      curr<span class="Delimiter">.</span>data = global_name<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L40" class="LineNr"> 40 </span>    <span class="Delimiter">}</span>
-<span id="L41" class="LineNr"> 41 </span>    <a href='003trace.cc.html#L98'>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#L227'>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; end<span class="Delimiter">();</span>
-<span id="L42" class="LineNr"> 42 </span>  <span class="Delimiter">}</span>
-<span id="L43" class="LineNr"> 43 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>data<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</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#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">)</span> &lt; <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L45" class="LineNr"> 45 </span>    p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span>
-<span id="L46" class="LineNr"> 46 </span>    p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>data<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">);</span>
+<span id="L6" class="LineNr">  6 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L6'>test_transform_literal_string</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L7" class="LineNr">  7 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L8" class="LineNr">  8 </span>      <span class="Constant">&quot;== code\n&quot;</span>
+<span id="L9" class="LineNr">  9 </span>      <span class="Constant">&quot;b8/copy  \&quot;</span>test\<span class="Constant">&quot;/imm32\n&quot;</span>
+<span id="L10" class="LineNr"> 10 </span>      <span class="Constant">&quot;== data\n&quot;</span>  <span class="Comment">// need to manually create the segment for now</span>
+<span id="L11" class="LineNr"> 11 </span>  <span class="Delimiter">);</span>
+<span id="L12" class="LineNr"> 12 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L13" class="LineNr"> 13 </span>      <span class="Constant">&quot;transform: -- move literal strings to data segment\n&quot;</span>
+<span id="L14" class="LineNr"> 14 </span>      <span class="Constant">&quot;transform: adding global variable '__subx_global_1' containing \&quot;</span>test\<span class="Constant">&quot;\n&quot;</span>
+<span id="L15" class="LineNr"> 15 </span>      <span class="Constant">&quot;transform: instruction after transform: 'b8 __subx_global_1'\n&quot;</span>
+<span id="L16" class="LineNr"> 16 </span>  <span class="Delimiter">);</span>
+<span id="L17" class="LineNr"> 17 </span><span class="Delimiter">}</span>
+<span id="L18" class="LineNr"> 18 </span>
+<span id="L19" class="LineNr"> 19 </span><span class="Comment">//: We don't rely on any transforms running in previous layers, but this layer</span>
+<span id="L20" class="LineNr"> 20 </span><span class="Comment">//: knows about labels and global variables and will emit them for previous</span>
+<span id="L21" class="LineNr"> 21 </span><span class="Comment">//: layers to transform.</span>
+<span id="L22" class="LineNr"> 22 </span><span class="Delimiter">:(after &quot;Begin Transforms&quot;)</span>
+<span id="L23" class="LineNr"> 23 </span><span class="Comment">// Begin Level-3 Transforms</span>
+<span id="L24" class="LineNr"> 24 </span><span class="Special"><a href='011run.cc.html#L235'>Transform</a></span><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='038---literal_strings.cc.html#L30'>transform_literal_strings</a><span class="Delimiter">);</span>
+<span id="L25" class="LineNr"> 25 </span><span class="Comment">// End Level-3 Transforms</span>
+<span id="L26" class="LineNr"> 26 </span>
+<span id="L27" class="LineNr"> 27 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L28" class="LineNr"> 28 </span><span class="Normal">int</span> <span class="Special"><a href='038---literal_strings.cc.html#L28'>Next_auto_global</a></span> = <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L29" class="LineNr"> 29 </span><span class="Delimiter">:(code)</span>
+<span id="L30" class="LineNr"> 30 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L30'>transform_literal_strings</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L31" class="LineNr"> 31 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- move literal strings to data segment&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L32" class="LineNr"> 32 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L33" class="LineNr"> 33 </span>  segment&amp; code = p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L34" class="LineNr"> 34 </span>  segment data<span class="Delimiter">;</span>
+<span id="L35" class="LineNr"> 35 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>code<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L36" class="LineNr"> 36 </span>    line&amp; inst = code<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L37" class="LineNr"> 37 </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#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L38" class="LineNr"> 38 </span>      word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
+<span id="L39" class="LineNr"> 39 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> != <span class="Constant">'&quot;'</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L40" class="LineNr"> 40 </span>      ostringstream global_name<span class="Delimiter">;</span>
+<span id="L41" class="LineNr"> 41 </span>      global_name &lt;&lt; <span class="Constant">&quot;__subx_global_&quot;</span> &lt;&lt; <span class="Special"><a href='038---literal_strings.cc.html#L28'>Next_auto_global</a></span><span class="Delimiter">;</span>
+<span id="L42" class="LineNr"> 42 </span>      ++<span class="Special"><a href='038---literal_strings.cc.html#L28'>Next_auto_global</a></span><span class="Delimiter">;</span>
+<span id="L43" class="LineNr"> 43 </span>      <a href='038---literal_strings.cc.html#L57'>add_global_to_data_segment</a><span class="Delimiter">(</span>global_name<span class="Delimiter">.</span>str<span class="Delimiter">(),</span> curr<span class="Delimiter">,</span> data<span class="Delimiter">);</span>
+<span id="L44" class="LineNr"> 44 </span>      curr<span class="Delimiter">.</span>data = global_name<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L45" class="LineNr"> 45 </span>    <span class="Delimiter">}</span>
+<span id="L46" class="LineNr"> 46 </span>    <a href='003trace.cc.html#L96'>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 transform: '&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; end<span class="Delimiter">();</span>
 <span id="L47" class="LineNr"> 47 </span>  <span class="Delimiter">}</span>
-<span id="L48" class="LineNr"> 48 </span>  vector&lt;line&gt;&amp; existing_data = p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">;</span>
-<span id="L49" class="LineNr"> 49 </span>  existing_data<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>existing_data<span class="Delimiter">.</span>end<span class="Delimiter">(),</span> data<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> data<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>end<span class="Delimiter">());</span>
-<span id="L50" class="LineNr"> 50 </span><span class="Delimiter">}</span>
-<span id="L51" class="LineNr"> 51 </span>
-<span id="L52" class="LineNr"> 52 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L52'>add_global_to_data_segment</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; name<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; value<span class="Delimiter">,</span> segment&amp; data<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L53" class="LineNr"> 53 </span>  <a href='003trace.cc.html#L98'>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;adding global variable '&quot;</span> &lt;&lt; name &lt;&lt; <span class="Constant">&quot;' containing &quot;</span> &lt;&lt; value<span class="Delimiter">.</span>data &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L54" class="LineNr"> 54 </span>  <span class="Comment">// emit label</span>
-<span id="L55" class="LineNr"> 55 </span>  data<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>label<span class="Delimiter">(</span>name<span class="Delimiter">));</span>
-<span id="L56" class="LineNr"> 56 </span>  <span class="Comment">// emit size for size-prefixed array</span>
-<span id="L57" class="LineNr"> 57 </span>  data<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L113'>line</a><span class="Delimiter">());</span>
-<span id="L58" class="LineNr"> 58 </span>  emit_hex_bytes<span class="Delimiter">(</span>data<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>back<span class="Delimiter">(),</span> <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>value<span class="Delimiter">.</span>data<span class="Delimiter">)</span>-<span class="Comment">/*</span><span class="Comment">skip quotes</span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">4</span><span class="Comment">/*</span><span class="Comment">bytes</span><span class="Comment">*/</span><span class="Delimiter">);</span>
-<span id="L59" class="LineNr"> 59 </span>  <span class="Comment">// emit data byte by byte</span>
-<span id="L60" class="LineNr"> 60 </span>  data<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L113'>line</a><span class="Delimiter">());</span>
-<span id="L61" class="LineNr"> 61 </span>  line&amp; curr = data<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>back<span class="Delimiter">();</span>
-<span id="L62" class="LineNr"> 62 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip start quote</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>value<span class="Delimiter">.</span>data<span class="Delimiter">)</span>-<span class="Comment">/*</span><span class="Comment">skip end quote</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L63" class="LineNr"> 63 </span>    <span class="Normal">char</span> c = value<span class="Delimiter">.</span>data<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L64" class="LineNr"> 64 </span>    curr<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L119'>word</a><span class="Delimiter">());</span>
-<span id="L65" class="LineNr"> 65 </span>    curr<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = <a href='030---operands.cc.html#L286'>hex_byte_to_string</a><span class="Delimiter">(</span>c<span class="Delimiter">);</span>
-<span id="L66" class="LineNr"> 66 </span>    curr<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">,</span> c<span class="Delimiter">));</span>
-<span id="L67" class="LineNr"> 67 </span>  <span class="Delimiter">}</span>
-<span id="L68" class="LineNr"> 68 </span><span class="Delimiter">}</span>
-<span id="L69" class="LineNr"> 69 </span>
-<span id="L70" class="LineNr"> 70 </span><span class="Comment">//: Within strings, whitespace is significant. So we need to redo our instruction</span>
-<span id="L71" class="LineNr"> 71 </span><span class="Comment">//: parsing.</span>
-<span id="L72" class="LineNr"> 72 </span>
-<span id="L73" class="LineNr"> 73 </span><span class="Delimiter">:(scenarios parse_instruction_character_by_character)</span>
-<span id="L74" class="LineNr"> 74 </span><span class="Delimiter">:(scenario instruction_with_string_literal)</span>
-<span id="L75" class="LineNr"> 75 </span>a <span class="Constant">&quot;abc  def&quot;</span> z  <span class="Comment"># two spaces inside string</span>
-<span id="L76" class="LineNr"> 76 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: a</span>
-<span id="L77" class="LineNr"> 77 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: &quot;abc  def&quot;</span>
-<span id="L78" class="LineNr"> 78 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: z</span>
-<span id="L79" class="LineNr"> 79 </span><span class="Comment"># no other words</span>
-<span id="L80" class="LineNr"> 80 </span>$parse2: <span class="Constant">3</span>
-<span id="L81" class="LineNr"> 81 </span>
-<span id="L82" class="LineNr"> 82 </span><span class="Delimiter">:(before &quot;End Line Parsing Special-cases(line_data -&gt; l)&quot;)</span>
-<span id="L83" class="LineNr"> 83 </span><span class="Normal">if</span> <span class="Delimiter">(</span>line_data<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">'&quot;'</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>  <span class="Comment">// can cause false-positives, but we can handle them</span>
-<span id="L84" class="LineNr"> 84 </span>  parse_instruction_character_by_character<span class="Delimiter">(</span>line_data<span class="Delimiter">,</span> l<span class="Delimiter">);</span>
-<span id="L85" class="LineNr"> 85 </span>  <span class="Identifier">continue</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">:(code)</span>
-<span id="L89" class="LineNr"> 89 </span><span class="Normal">void</span> parse_instruction_character_by_character<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; line_data<span class="Delimiter">,</span> vector&lt;line&gt;&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L90" class="LineNr"> 90 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>line_data<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="cSpecial">'\n'</span><span class="Delimiter">)</span> != string::npos  &amp;&amp; line_data<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="cSpecial">'\n'</span><span class="Delimiter">)</span> != line_data<span class="Delimiter">.</span>size<span class="Delimiter">()</span>-<span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L91" class="LineNr"> 91 </span>    <a href='003trace.cc.html#L217'>raise</a> &lt;&lt; <span class="Constant">&quot;parse_instruction_character_by_character: should receive only a single line\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L92" class="LineNr"> 92 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L93" class="LineNr"> 93 </span>  <span class="Delimiter">}</span>
-<span id="L94" class="LineNr"> 94 </span>  <span class="Comment">// parse literals</span>
-<span id="L95" class="LineNr"> 95 </span>  istringstream in<span class="Delimiter">(</span>line_data<span class="Delimiter">);</span>
-<span id="L96" class="LineNr"> 96 </span>  in &gt;&gt; std::noskipws<span class="Delimiter">;</span>
-<span id="L97" class="LineNr"> 97 </span>  <a href='011run.cc.html#L113'>line</a> result<span class="Delimiter">;</span>
-<span id="L98" class="LineNr"> 98 </span>  <span class="Comment">// add tokens (words or strings) one by one</span>
-<span id="L99" class="LineNr"> 99 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L100" class="LineNr">100 </span>    <a href='038---literal_strings.cc.html#L151'>skip_whitespace</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
-<span id="L101" class="LineNr">101 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L102" class="LineNr">102 </span>    <span class="Normal">char</span> c = in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
-<span id="L103" class="LineNr">103 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'#'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// comment; drop rest of line</span>
-<span id="L104" class="LineNr">104 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">':'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// line metadata; skip for now</span>
-<span id="L105" class="LineNr">105 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'.'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L106" class="LineNr">106 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// comment token at end of line</span>
-<span id="L107" class="LineNr">107 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()))</span>
-<span id="L108" class="LineNr">108 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// '.' followed by space is comment token; skip</span>
-<span id="L109" class="LineNr">109 </span>    <span class="Delimiter">}</span>
-<span id="L110" class="LineNr">110 </span>    result<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L119'>word</a><span class="Delimiter">());</span>
-<span id="L111" class="LineNr">111 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'&quot;'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L112" class="LineNr">112 </span>      <span class="Comment">// slurp word data</span>
-<span id="L113" class="LineNr">113 </span>      ostringstream d<span class="Delimiter">;</span>
-<span id="L114" class="LineNr">114 </span>      d &lt;&lt; c<span class="Delimiter">;</span>
-<span id="L115" class="LineNr">115 </span>      <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L116" class="LineNr">116 </span>        in &gt;&gt; c<span class="Delimiter">;</span>
-<span id="L117" class="LineNr">117 </span>        d &lt;&lt; c<span class="Delimiter">;</span>
-<span id="L118" class="LineNr">118 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'&quot;'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L119" class="LineNr">119 </span>      <span class="Delimiter">}</span>
-<span id="L120" class="LineNr">120 </span>      result<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = d<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L121" class="LineNr">121 </span>      <span class="Comment">// slurp metadata</span>
-<span id="L122" class="LineNr">122 </span>      ostringstream m<span class="Delimiter">;</span>
-<span id="L123" class="LineNr">123 </span>      <span class="Normal">while</span> <span class="Delimiter">(</span>!isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">())</span> &amp;&amp; <a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L124" class="LineNr">124 </span>        in &gt;&gt; c<span class="Delimiter">;</span>
-<span id="L125" class="LineNr">125 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'/'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L126" class="LineNr">126 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>!m<span class="Delimiter">.</span>str<span class="Delimiter">().</span>empty<span class="Delimiter">())</span> result<span class="Delimiter">.</span><a href='011run.cc.html#L114'>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>str<span class="Delimiter">());</span>
-<span id="L127" class="LineNr">127 </span>          m<span class="Delimiter">.</span>str<span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L128" class="LineNr">128 </span>        <span class="Delimiter">}</span>
-<span id="L129" class="LineNr">129 </span>        <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L130" class="LineNr">130 </span>          m &lt;&lt; c<span class="Delimiter">;</span>
-<span id="L131" class="LineNr">131 </span>        <span class="Delimiter">}</span>
-<span id="L132" class="LineNr">132 </span>      <span class="Delimiter">}</span>
-<span id="L133" class="LineNr">133 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!m<span class="Delimiter">.</span>str<span class="Delimiter">().</span>empty<span class="Delimiter">())</span> result<span class="Delimiter">.</span><a href='011run.cc.html#L114'>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>str<span class="Delimiter">());</span>
-<span id="L134" class="LineNr">134 </span>    <span class="Delimiter">}</span>
-<span id="L135" class="LineNr">135 </span>    <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L136" class="LineNr">136 </span>      <span class="Comment">// slurp all characters until whitespace</span>
-<span id="L137" class="LineNr">137 </span>      ostringstream w<span class="Delimiter">;</span>
-<span id="L138" class="LineNr">138 </span>      w &lt;&lt; c<span class="Delimiter">;</span>
-<span id="L139" class="LineNr">139 </span>      <span class="Normal">while</span> <span class="Delimiter">(</span>!isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">())</span> &amp;&amp; <a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>  <span class="Comment">// peek can sometimes trigger eof(), so do it first</span>
-<span id="L140" class="LineNr">140 </span>        in &gt;&gt; c<span class="Delimiter">;</span>
-<span id="L141" class="LineNr">141 </span>        w &lt;&lt; c<span class="Delimiter">;</span>
-<span id="L142" class="LineNr">142 </span>      <span class="Delimiter">}</span>
-<span id="L143" class="LineNr">143 </span>      <a href='011run.cc.html#L186'>parse_word</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>str<span class="Delimiter">(),</span> result<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">());</span>
-<span id="L144" class="LineNr">144 </span>    <span class="Delimiter">}</span>
-<span id="L145" class="LineNr">145 </span>    <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse2&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;word: &quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>result<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">())</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L146" class="LineNr">146 </span>  <span class="Delimiter">}</span>
-<span id="L147" class="LineNr">147 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!result<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
-<span id="L148" class="LineNr">148 </span>    out<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>result<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">void</span> <a href='038---literal_strings.cc.html#L151'>skip_whitespace</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L152" class="LineNr">152 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L153" class="LineNr">153 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()))</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
-<span id="L154" class="LineNr">154 </span>    <span class="Normal">else</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L48" class="LineNr"> 48 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>data<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L49" class="LineNr"> 49 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">)</span> &lt; <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L50" class="LineNr"> 50 </span>    p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span>
+<span id="L51" class="LineNr"> 51 </span>    p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>data<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">);</span>
+<span id="L52" class="LineNr"> 52 </span>  <span class="Delimiter">}</span>
+<span id="L53" class="LineNr"> 53 </span>  vector&lt;line&gt;&amp; existing_data = p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">;</span>
+<span id="L54" class="LineNr"> 54 </span>  existing_data<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>existing_data<span class="Delimiter">.</span>end<span class="Delimiter">(),</span> data<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> data<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>end<span class="Delimiter">());</span>
+<span id="L55" class="LineNr"> 55 </span><span class="Delimiter">}</span>
+<span id="L56" class="LineNr"> 56 </span>
+<span id="L57" class="LineNr"> 57 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L57'>add_global_to_data_segment</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; name<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; value<span class="Delimiter">,</span> segment&amp; data<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L58" class="LineNr"> 58 </span>  <a href='003trace.cc.html#L96'>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;adding global variable '&quot;</span> &lt;&lt; name &lt;&lt; <span class="Constant">&quot;' containing &quot;</span> &lt;&lt; value<span class="Delimiter">.</span>data &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L59" class="LineNr"> 59 </span>  <span class="Comment">// emit label</span>
+<span id="L60" class="LineNr"> 60 </span>  data<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>label<span class="Delimiter">(</span>name<span class="Delimiter">));</span>
+<span id="L61" class="LineNr"> 61 </span>  <span class="Comment">// emit size for size-prefixed array</span>
+<span id="L62" class="LineNr"> 62 </span>  data<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L120'>line</a><span class="Delimiter">());</span>
+<span id="L63" class="LineNr"> 63 </span>  emit_hex_bytes<span class="Delimiter">(</span>data<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>back<span class="Delimiter">(),</span> <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>value<span class="Delimiter">.</span>data<span class="Delimiter">)</span>-<span class="Comment">/*</span><span class="Comment">skip quotes</span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">4</span><span class="Comment">/*</span><span class="Comment">bytes</span><span class="Comment">*/</span><span class="Delimiter">);</span>
+<span id="L64" class="LineNr"> 64 </span>  <span class="Comment">// emit data byte by byte</span>
+<span id="L65" class="LineNr"> 65 </span>  data<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L120'>line</a><span class="Delimiter">());</span>
+<span id="L66" class="LineNr"> 66 </span>  line&amp; curr = data<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>back<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> i = <span class="Comment">/*</span><span class="Comment">skip start quote</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>value<span class="Delimiter">.</span>data<span class="Delimiter">)</span>-<span class="Comment">/*</span><span class="Comment">skip end quote</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L68" class="LineNr"> 68 </span>    <span class="Normal">char</span> c = value<span class="Delimiter">.</span>data<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L69" class="LineNr"> 69 </span>    curr<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L126'>word</a><span class="Delimiter">());</span>
+<span id="L70" class="LineNr"> 70 </span>    curr<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = <a href='030---operands.cc.html#L293'>hex_byte_to_string</a><span class="Delimiter">(</span>c<span class="Delimiter">);</span>
+<span id="L71" class="LineNr"> 71 </span>    curr<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">,</span> c<span class="Delimiter">));</span>
+<span id="L72" class="LineNr"> 72 </span>  <span class="Delimiter">}</span>
+<span id="L73" class="LineNr"> 73 </span><span class="Delimiter">}</span>
+<span id="L74" class="LineNr"> 74 </span>
+<span id="L75" class="LineNr"> 75 </span><span class="Comment">//: Within strings, whitespace is significant. So we need to redo our instruction</span>
+<span id="L76" class="LineNr"> 76 </span><span class="Comment">//: parsing.</span>
+<span id="L77" class="LineNr"> 77 </span>
+<span id="L78" class="LineNr"> 78 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L78'>test_instruction_with_string_literal</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L79" class="LineNr"> 79 </span>  parse_instruction_character_by_character<span class="Delimiter">(</span>
+<span id="L80" class="LineNr"> 80 </span>      <span class="Constant">&quot;a \&quot;</span>abc  def\<span class="Constant">&quot; z\n&quot;</span>  <span class="Comment">// two spaces inside string</span>
+<span id="L81" class="LineNr"> 81 </span>  <span class="Delimiter">);</span>
+<span id="L82" class="LineNr"> 82 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L83" class="LineNr"> 83 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L126'>word</a>: a\n&quot;</span>
+<span id="L84" class="LineNr"> 84 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L126'>word</a>: \&quot;</span>abc  def\<span class="Constant">&quot;\n&quot;</span>
+<span id="L85" class="LineNr"> 85 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L126'>word</a>: z\n&quot;</span>
+<span id="L86" class="LineNr"> 86 </span>  <span class="Delimiter">);</span>
+<span id="L87" class="LineNr"> 87 </span>  <span class="Comment">// no other words</span>
+<span id="L88" class="LineNr"> 88 </span>  <a href='003trace.cc.html#L270'>CHECK_TRACE_COUNT</a><span class="Delimiter">(</span><span class="Constant">&quot;parse2&quot;</span><span class="Delimiter">,</span> <span class="Constant">3</span><span class="Delimiter">);</span>
+<span id="L89" class="LineNr"> 89 </span><span class="Delimiter">}</span>
+<span id="L90" class="LineNr"> 90 </span>
+<span id="L91" class="LineNr"> 91 </span><span class="Delimiter">:(before &quot;End Line Parsing Special-cases(line_data -&gt; l)&quot;)</span>
+<span id="L92" class="LineNr"> 92 </span><span class="Normal">if</span> <span class="Delimiter">(</span>line_data<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">'&quot;'</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>  <span class="Comment">// can cause false-positives, but we can handle them</span>
+<span id="L93" class="LineNr"> 93 </span>  parse_instruction_character_by_character<span class="Delimiter">(</span>line_data<span class="Delimiter">,</span> l<span class="Delimiter">);</span>
+<span id="L94" class="LineNr"> 94 </span>  <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L95" class="LineNr"> 95 </span><span class="Delimiter">}</span>
+<span id="L96" class="LineNr"> 96 </span>
+<span id="L97" class="LineNr"> 97 </span><span class="Delimiter">:(code)</span>
+<span id="L98" class="LineNr"> 98 </span><span class="Normal">void</span> parse_instruction_character_by_character<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; line_data<span class="Delimiter">,</span> vector&lt;line&gt;&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L99" class="LineNr"> 99 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>line_data<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="cSpecial">'\n'</span><span class="Delimiter">)</span> != string::npos  &amp;&amp; line_data<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="cSpecial">'\n'</span><span class="Delimiter">)</span> != line_data<span class="Delimiter">.</span>size<span class="Delimiter">()</span>-<span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L100" class="LineNr">100 </span>    <a href='003trace.cc.html#L202'>raise</a> &lt;&lt; <span class="Constant">&quot;parse_instruction_character_by_character: should receive only a single line\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L101" class="LineNr">101 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L102" class="LineNr">102 </span>  <span class="Delimiter">}</span>
+<span id="L103" class="LineNr">103 </span>  <span class="Comment">// parse literals</span>
+<span id="L104" class="LineNr">104 </span>  istringstream in<span class="Delimiter">(</span>line_data<span class="Delimiter">);</span>
+<span id="L105" class="LineNr">105 </span>  in &gt;&gt; std::noskipws<span class="Delimiter">;</span>
+<span id="L106" class="LineNr">106 </span>  <a href='011run.cc.html#L120'>line</a> result<span class="Delimiter">;</span>
+<span id="L107" class="LineNr">107 </span>  <span class="Comment">// add tokens (words or strings) one by one</span>
+<span id="L108" class="LineNr">108 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L109" class="LineNr">109 </span>    <a href='038---literal_strings.cc.html#L160'>skip_whitespace</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L110" class="LineNr">110 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L111" class="LineNr">111 </span>    <span class="Normal">char</span> c = in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
+<span id="L112" class="LineNr">112 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'#'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// comment; drop rest of line</span>
+<span id="L113" class="LineNr">113 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">':'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// line metadata; skip for now</span>
+<span id="L114" class="LineNr">114 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'.'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L115" class="LineNr">115 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// comment token at end of line</span>
+<span id="L116" class="LineNr">116 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()))</span>
+<span id="L117" class="LineNr">117 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// '.' followed by space is comment token; skip</span>
+<span id="L118" class="LineNr">118 </span>    <span class="Delimiter">}</span>
+<span id="L119" class="LineNr">119 </span>    result<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L126'>word</a><span class="Delimiter">());</span>
+<span id="L120" class="LineNr">120 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'&quot;'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L121" class="LineNr">121 </span>      <span class="Comment">// slurp word data</span>
+<span id="L122" class="LineNr">122 </span>      ostringstream d<span class="Delimiter">;</span>
+<span id="L123" class="LineNr">123 </span>      d &lt;&lt; c<span class="Delimiter">;</span>
+<span id="L124" class="LineNr">124 </span>      <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L125" class="LineNr">125 </span>        in &gt;&gt; c<span class="Delimiter">;</span>
+<span id="L126" class="LineNr">126 </span>        d &lt;&lt; c<span class="Delimiter">;</span>
+<span id="L127" class="LineNr">127 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'&quot;'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L128" class="LineNr">128 </span>      <span class="Delimiter">}</span>
+<span id="L129" class="LineNr">129 </span>      result<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = d<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L130" class="LineNr">130 </span>      <span class="Comment">// slurp metadata</span>
+<span id="L131" class="LineNr">131 </span>      ostringstream m<span class="Delimiter">;</span>
+<span id="L132" class="LineNr">132 </span>      <span class="Normal">while</span> <span class="Delimiter">(</span>!isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">())</span> &amp;&amp; <a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L133" class="LineNr">133 </span>        in &gt;&gt; c<span class="Delimiter">;</span>
+<span id="L134" class="LineNr">134 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'/'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L135" class="LineNr">135 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>!m<span class="Delimiter">.</span>str<span class="Delimiter">().</span>empty<span class="Delimiter">())</span> result<span class="Delimiter">.</span><a href='011run.cc.html#L121'>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>str<span class="Delimiter">());</span>
+<span id="L136" class="LineNr">136 </span>          m<span class="Delimiter">.</span>str<span class="Delimiter">(</span><span class="Constant">&quot;&quot;</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>          m &lt;&lt; c<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>      <span class="Normal">if</span> <span class="Delimiter">(</span>!m<span class="Delimiter">.</span>str<span class="Delimiter">().</span>empty<span class="Delimiter">())</span> result<span class="Delimiter">.</span><a href='011run.cc.html#L121'>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>str<span class="Delimiter">());</span>
+<span id="L143" class="LineNr">143 </span>    <span class="Delimiter">}</span>
+<span id="L144" class="LineNr">144 </span>    <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L145" class="LineNr">145 </span>      <span class="Comment">// slurp all characters until whitespace</span>
+<span id="L146" class="LineNr">146 </span>      ostringstream w<span class="Delimiter">;</span>
+<span id="L147" class="LineNr">147 </span>      w &lt;&lt; c<span class="Delimiter">;</span>
+<span id="L148" class="LineNr">148 </span>      <span class="Normal">while</span> <span class="Delimiter">(</span>!isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">())</span> &amp;&amp; <a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>  <span class="Comment">// peek can sometimes trigger eof(), so do it first</span>
+<span id="L149" class="LineNr">149 </span>        in &gt;&gt; c<span class="Delimiter">;</span>
+<span id="L150" class="LineNr">150 </span>        w &lt;&lt; c<span class="Delimiter">;</span>
+<span id="L151" class="LineNr">151 </span>      <span class="Delimiter">}</span>
+<span id="L152" class="LineNr">152 </span>      <a href='011run.cc.html#L193'>parse_word</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>str<span class="Delimiter">(),</span> result<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">());</span>
+<span id="L153" class="LineNr">153 </span>    <span class="Delimiter">}</span>
+<span id="L154" class="LineNr">154 </span>    <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse2&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;word: &quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>result<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">())</span> &lt;&lt; end<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="Normal">void</span> <a href='038---literal_strings.cc.html#L158'>skip_comment</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L159" class="LineNr">159 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> == <span class="Constant">'#'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L160" class="LineNr">160 </span>    in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
-<span id="L161" class="LineNr">161 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> != <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
-<span id="L162" class="LineNr">162 </span>  <span class="Delimiter">}</span>
-<span id="L163" class="LineNr">163 </span><span class="Delimiter">}</span>
-<span id="L164" class="LineNr">164 </span>
-<span id="L165" class="LineNr">165 </span><span class="Comment">// helper for tests</span>
-<span id="L166" class="LineNr">166 </span><span class="Normal">void</span> parse_instruction_character_by_character<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; line_data<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L167" class="LineNr">167 </span>  vector&lt;line&gt; out<span class="Delimiter">;</span>
-<span id="L168" class="LineNr">168 </span>  parse_instruction_character_by_character<span class="Delimiter">(</span>line_data<span class="Delimiter">,</span> out<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><span class="Delimiter">:(scenario parse2_comment_token_in_middle)</span>
-<span id="L172" class="LineNr">172 </span>a <span class="Delimiter">.</span> z
-<span id="L173" class="LineNr">173 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: a</span>
-<span id="L174" class="LineNr">174 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: z</span>
-<span id="L175" class="LineNr">175 </span><span class="traceAbsent">-parse2: <a href='011run.cc.html#L119'>word</a>: .</span>
-<span id="L176" class="LineNr">176 </span><span class="Comment"># no other words</span>
-<span id="L177" class="LineNr">177 </span>$parse2: <span class="Constant">2</span>
-<span id="L178" class="LineNr">178 </span>
-<span id="L179" class="LineNr">179 </span><span class="Delimiter">:(scenario parse2_word_starting_with_dot)</span>
-<span id="L180" class="LineNr">180 </span>a <span class="Delimiter">.</span>b c
-<span id="L181" class="LineNr">181 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: a</span>
-<span id="L182" class="LineNr">182 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: .b</span>
-<span id="L183" class="LineNr">183 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: c</span>
-<span id="L184" class="LineNr">184 </span>
-<span id="L185" class="LineNr">185 </span><span class="Delimiter">:(scenario parse2_comment_token_at_start)</span>
-<span id="L186" class="LineNr">186 </span><span class="Delimiter">.</span> a b
-<span id="L187" class="LineNr">187 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: a</span>
-<span id="L188" class="LineNr">188 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: b</span>
-<span id="L189" class="LineNr">189 </span><span class="traceAbsent">-parse2: <a href='011run.cc.html#L119'>word</a>: .</span>
-<span id="L190" class="LineNr">190 </span>
-<span id="L191" class="LineNr">191 </span><span class="Delimiter">:(scenario parse2_comment_token_at_end)</span>
-<span id="L192" class="LineNr">192 </span>a b <span class="Delimiter">.</span>
-<span id="L193" class="LineNr">193 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: a</span>
-<span id="L194" class="LineNr">194 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: b</span>
-<span id="L195" class="LineNr">195 </span><span class="traceAbsent">-parse2: <a href='011run.cc.html#L119'>word</a>: .</span>
-<span id="L196" class="LineNr">196 </span>
-<span id="L197" class="LineNr">197 </span><span class="Delimiter">:(scenario parse2_word_starting_with_dot_at_start)</span>
-<span id="L198" class="LineNr">198 </span><span class="Delimiter">.</span>a b c
-<span id="L199" class="LineNr">199 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: .a</span>
-<span id="L200" class="LineNr">200 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: b</span>
-<span id="L201" class="LineNr">201 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: c</span>
-<span id="L202" class="LineNr">202 </span>
-<span id="L203" class="LineNr">203 </span><span class="Delimiter">:(scenario parse2_metadata)</span>
-<span id="L204" class="LineNr">204 </span><span class="Delimiter">.</span>a b/c d
-<span id="L205" class="LineNr">205 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: .a</span>
-<span id="L206" class="LineNr">206 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: b /c</span>
-<span id="L207" class="LineNr">207 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: d</span>
-<span id="L208" class="LineNr">208 </span>
-<span id="L209" class="LineNr">209 </span><span class="Delimiter">:(scenario parse2_string_with_metadata)</span>
-<span id="L210" class="LineNr">210 </span>a <span class="Constant">&quot;bc  def&quot;</span>/disp32 g
-<span id="L211" class="LineNr">211 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: a</span>
-<span id="L212" class="LineNr">212 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: &quot;bc  def&quot; /disp32</span>
-<span id="L213" class="LineNr">213 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: g</span>
+<span id="L156" class="LineNr">156 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!result<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
+<span id="L157" class="LineNr">157 </span>    out<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>result<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="Normal">void</span> <a href='038---literal_strings.cc.html#L160'>skip_whitespace</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L161" class="LineNr">161 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L162" class="LineNr">162 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()))</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
+<span id="L163" class="LineNr">163 </span>    <span class="Normal">else</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><span class="Delimiter">}</span>
+<span id="L166" class="LineNr">166 </span>
+<span id="L167" class="LineNr">167 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L167'>skip_comment</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L168" class="LineNr">168 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> == <span class="Constant">'#'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L169" class="LineNr">169 </span>    in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
+<span id="L170" class="LineNr">170 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> != <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
+<span id="L171" class="LineNr">171 </span>  <span class="Delimiter">}</span>
+<span id="L172" class="LineNr">172 </span><span class="Delimiter">}</span>
+<span id="L173" class="LineNr">173 </span>
+<span id="L174" class="LineNr">174 </span><span class="Comment">// helper for tests</span>
+<span id="L175" class="LineNr">175 </span><span class="Normal">void</span> parse_instruction_character_by_character<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; line_data<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L176" class="LineNr">176 </span>  vector&lt;line&gt; out<span class="Delimiter">;</span>
+<span id="L177" class="LineNr">177 </span>  parse_instruction_character_by_character<span class="Delimiter">(</span>line_data<span class="Delimiter">,</span> out<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><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L180'>test_parse2_comment_token_in_middle</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L181" class="LineNr">181 </span>  parse_instruction_character_by_character<span class="Delimiter">(</span>
+<span id="L182" class="LineNr">182 </span>      <span class="Constant">&quot;a . z\n&quot;</span>
+<span id="L183" class="LineNr">183 </span>  <span class="Delimiter">);</span>
+<span id="L184" class="LineNr">184 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L185" class="LineNr">185 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L126'>word</a>: a\n&quot;</span>
+<span id="L186" class="LineNr">186 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L126'>word</a>: z\n&quot;</span>
+<span id="L187" class="LineNr">187 </span>  <span class="Delimiter">);</span>
+<span id="L188" class="LineNr">188 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;parse2: <a href='011run.cc.html#L126'>word</a>: .&quot;</span><span class="Delimiter">);</span>
+<span id="L189" class="LineNr">189 </span>  <span class="Comment">// no other words</span>
+<span id="L190" class="LineNr">190 </span>  <a href='003trace.cc.html#L270'>CHECK_TRACE_COUNT</a><span class="Delimiter">(</span><span class="Constant">&quot;parse2&quot;</span><span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span>
+<span id="L191" class="LineNr">191 </span><span class="Delimiter">}</span>
+<span id="L192" class="LineNr">192 </span>
+<span id="L193" class="LineNr">193 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L193'>test_parse2_word_starting_with_dot</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L194" class="LineNr">194 </span>  parse_instruction_character_by_character<span class="Delimiter">(</span>
+<span id="L195" class="LineNr">195 </span>      <span class="Constant">&quot;a .b c\n&quot;</span>
+<span id="L196" class="LineNr">196 </span>  <span class="Delimiter">);</span>
+<span id="L197" class="LineNr">197 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L198" class="LineNr">198 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L126'>word</a>: a\n&quot;</span>
+<span id="L199" class="LineNr">199 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L126'>word</a>: .b\n&quot;</span>
+<span id="L200" class="LineNr">200 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L126'>word</a>: c\n&quot;</span>
+<span id="L201" class="LineNr">201 </span>  <span class="Delimiter">);</span>
+<span id="L202" class="LineNr">202 </span><span class="Delimiter">}</span>
+<span id="L203" class="LineNr">203 </span>
+<span id="L204" class="LineNr">204 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L204'>test_parse2_comment_token_at_start</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L205" class="LineNr">205 </span>  parse_instruction_character_by_character<span class="Delimiter">(</span>
+<span id="L206" class="LineNr">206 </span>      <span class="Constant">&quot;. a b\n&quot;</span>
+<span id="L207" class="LineNr">207 </span>  <span class="Delimiter">);</span>
+<span id="L208" class="LineNr">208 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L209" class="LineNr">209 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L126'>word</a>: a\n&quot;</span>
+<span id="L210" class="LineNr">210 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L126'>word</a>: b\n&quot;</span>
+<span id="L211" class="LineNr">211 </span>  <span class="Delimiter">);</span>
+<span id="L212" class="LineNr">212 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;parse2: <a href='011run.cc.html#L126'>word</a>: .&quot;</span><span class="Delimiter">);</span>
+<span id="L213" class="LineNr">213 </span><span class="Delimiter">}</span>
 <span id="L214" class="LineNr">214 </span>
-<span id="L215" class="LineNr">215 </span><span class="Delimiter">:(scenario parse2_string_with_metadata_at_end)</span>
-<span id="L216" class="LineNr">216 </span>a <span class="Constant">&quot;bc  def&quot;</span>/disp32
-<span id="L217" class="LineNr">217 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: a</span>
-<span id="L218" class="LineNr">218 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: &quot;bc  def&quot; /disp32</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="Normal">void</span> <a href='038---literal_strings.cc.html#L221'>test_parse2_string_with_metadata_at_end_of_line_without_newline</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L222" class="LineNr">222 </span>  parse_instruction_character_by_character<span class="Delimiter">(</span>
-<span id="L223" class="LineNr">223 </span>      <span class="Constant">&quot;68/push \&quot;</span>test\<span class="Constant">&quot;/f&quot;</span>  <span class="Comment">// no newline, which is how calls from parse() will look</span>
-<span id="L224" class="LineNr">224 </span>  <span class="Delimiter">);</span>
-<span id="L225" class="LineNr">225 </span>  <a href='003trace.cc.html#L258'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
-<span id="L226" class="LineNr">226 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L119'>word</a>: 68 /push^D&quot;</span>
-<span id="L227" class="LineNr">227 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L119'>word</a>: \&quot;</span>test\<span class="Constant">&quot; /f^D&quot;</span>
-<span id="L228" class="LineNr">228 </span>  <span class="Delimiter">);</span>
-<span id="L229" class="LineNr">229 </span><span class="Delimiter">}</span>
-<span id="L230" class="LineNr">230 </span>
-<span id="L231" class="LineNr">231 </span><span class="Comment">//: Make sure slashes inside strings don't trigger adding stuff from inside the</span>
-<span id="L232" class="LineNr">232 </span><span class="Comment">//: string to metadata.</span>
-<span id="L233" class="LineNr">233 </span><span class="Delimiter">:(scenario parse2_string_containing_slashes)</span>
-<span id="L234" class="LineNr">234 </span>a <span class="Constant">&quot;bc/def&quot;</span>/disp32
-<span id="L235" class="LineNr">235 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L119'>word</a>: &quot;bc/def&quot; /disp32</span>
+<span id="L215" class="LineNr">215 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L215'>test_parse2_comment_token_at_end</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L216" class="LineNr">216 </span>  parse_instruction_character_by_character<span class="Delimiter">(</span>
+<span id="L217" class="LineNr">217 </span>      <span class="Constant">&quot;a b .\n&quot;</span>
+<span id="L218" class="LineNr">218 </span>  <span class="Delimiter">);</span>
+<span id="L219" class="LineNr">219 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L220" class="LineNr">220 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L126'>word</a>: a\n&quot;</span>
+<span id="L221" class="LineNr">221 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L126'>word</a>: b\n&quot;</span>
+<span id="L222" class="LineNr">222 </span>  <span class="Delimiter">);</span>
+<span id="L223" class="LineNr">223 </span>  <a href='003trace.cc.html#L268'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;parse2: <a href='011run.cc.html#L126'>word</a>: .&quot;</span><span class="Delimiter">);</span>
+<span id="L224" class="LineNr">224 </span><span class="Delimiter">}</span>
+<span id="L225" class="LineNr">225 </span>
+<span id="L226" class="LineNr">226 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L226'>test_parse2_word_starting_with_dot_at_start</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L227" class="LineNr">227 </span>  parse_instruction_character_by_character<span class="Delimiter">(</span>
+<span id="L228" class="LineNr">228 </span>      <span class="Constant">&quot;.a b c\n&quot;</span>
+<span id="L229" class="LineNr">229 </span>  <span class="Delimiter">);</span>
+<span id="L230" class="LineNr">230 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L231" class="LineNr">231 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L126'>word</a>: .a\n&quot;</span>
+<span id="L232" class="LineNr">232 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L126'>word</a>: b\n&quot;</span>
+<span id="L233" class="LineNr">233 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L126'>word</a>: c\n&quot;</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="Normal">void</span> <a href='038---literal_strings.cc.html#L237'>test_parse2_metadata</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L238" class="LineNr">238 </span>  parse_instruction_character_by_character<span class="Delimiter">(</span>
+<span id="L239" class="LineNr">239 </span>      <span class="Constant">&quot;.a b/c d\n&quot;</span>
+<span id="L240" class="LineNr">240 </span>  <span class="Delimiter">);</span>
+<span id="L241" class="LineNr">241 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L242" class="LineNr">242 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L126'>word</a>: .a\n&quot;</span>
+<span id="L243" class="LineNr">243 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L126'>word</a>: b /c\n&quot;</span>
+<span id="L244" class="LineNr">244 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L126'>word</a>: d\n&quot;</span>
+<span id="L245" class="LineNr">245 </span>  <span class="Delimiter">);</span>
+<span id="L246" class="LineNr">246 </span><span class="Delimiter">}</span>
+<span id="L247" class="LineNr">247 </span>
+<span id="L248" class="LineNr">248 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L248'>test_parse2_string_with_metadata</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L249" class="LineNr">249 </span>  parse_instruction_character_by_character<span class="Delimiter">(</span>
+<span id="L250" class="LineNr">250 </span>      <span class="Constant">&quot;a \&quot;</span>bc  def\<span class="Constant">&quot;/disp32 g\n&quot;</span>
+<span id="L251" class="LineNr">251 </span>  <span class="Delimiter">);</span>
+<span id="L252" class="LineNr">252 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L253" class="LineNr">253 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L126'>word</a>: a\n&quot;</span>
+<span id="L254" class="LineNr">254 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L126'>word</a>: \&quot;</span>bc  def\<span class="Constant">&quot; /disp32\n&quot;</span>
+<span id="L255" class="LineNr">255 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L126'>word</a>: g\n&quot;</span>
+<span id="L256" class="LineNr">256 </span>  <span class="Delimiter">);</span>
+<span id="L257" class="LineNr">257 </span><span class="Delimiter">}</span>
+<span id="L258" class="LineNr">258 </span>
+<span id="L259" class="LineNr">259 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L259'>test_parse2_string_with_metadata_at_end</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L260" class="LineNr">260 </span>  parse_instruction_character_by_character<span class="Delimiter">(</span>
+<span id="L261" class="LineNr">261 </span>      <span class="Constant">&quot;a \&quot;</span>bc  def\<span class="Constant">&quot;/disp32\n&quot;</span>
+<span id="L262" class="LineNr">262 </span>  <span class="Delimiter">);</span>
+<span id="L263" class="LineNr">263 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L264" class="LineNr">264 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L126'>word</a>: a\n&quot;</span>
+<span id="L265" class="LineNr">265 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L126'>word</a>: \&quot;</span>bc  def\<span class="Constant">&quot; /disp32\n&quot;</span>
+<span id="L266" class="LineNr">266 </span>  <span class="Delimiter">);</span>
+<span id="L267" class="LineNr">267 </span><span class="Delimiter">}</span>
+<span id="L268" class="LineNr">268 </span>
+<span id="L269" class="LineNr">269 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L269'>test_parse2_string_with_metadata_at_end_of_line_without_newline</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L270" class="LineNr">270 </span>  parse_instruction_character_by_character<span class="Delimiter">(</span>
+<span id="L271" class="LineNr">271 </span>      <span class="Constant">&quot;68/push \&quot;</span>test\<span class="Constant">&quot;/f&quot;</span>  <span class="Comment">// no newline, which is how calls from parse() will look</span>
+<span id="L272" class="LineNr">272 </span>  <span class="Delimiter">);</span>
+<span id="L273" class="LineNr">273 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L274" class="LineNr">274 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L126'>word</a>: 68 /push\n&quot;</span>
+<span id="L275" class="LineNr">275 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L126'>word</a>: \&quot;</span>test\<span class="Constant">&quot; /f\n&quot;</span>
+<span id="L276" class="LineNr">276 </span>  <span class="Delimiter">);</span>
+<span id="L277" class="LineNr">277 </span><span class="Delimiter">}</span>
+<span id="L278" class="LineNr">278 </span>
+<span id="L279" class="LineNr">279 </span><span class="Comment">//: Make sure slashes inside strings don't trigger adding stuff from inside the</span>
+<span id="L280" class="LineNr">280 </span><span class="Comment">//: string to metadata.</span>
+<span id="L281" class="LineNr">281 </span>
+<span id="L282" class="LineNr">282 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L282'>test_parse2_string_containing_slashes</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L283" class="LineNr">283 </span>  parse_instruction_character_by_character<span class="Delimiter">(</span>
+<span id="L284" class="LineNr">284 </span>      <span class="Constant">&quot;a \&quot;</span>bc/def\<span class="Constant">&quot;/disp32\n&quot;</span>
+<span id="L285" class="LineNr">285 </span>  <span class="Delimiter">);</span>
+<span id="L286" class="LineNr">286 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L287" class="LineNr">287 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L126'>word</a>: \&quot;</span>bc/def\<span class="Constant">&quot; /disp32\n&quot;</span>
+<span id="L288" class="LineNr">288 </span>  <span class="Delimiter">);</span>
+<span id="L289" class="LineNr">289 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/039debug.cc.html b/html/subx/039debug.cc.html
index 3ea1126f..e50b1c9a 100644
--- a/html/subx/039debug.cc.html
+++ b/html/subx/039debug.cc.html
@@ -81,37 +81,45 @@ if ('onhashchange' in window) {
 <span id="L22" class="LineNr">22 </span>
 <span id="L23" class="LineNr">23 </span><span class="Delimiter">:(after &quot;Run One Instruction&quot;)</span>
 <span id="L24" class="LineNr">24 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L256'>contains_key</a><span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">,</span> EIP<span class="Delimiter">))</span>
-<span id="L25" class="LineNr">25 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;== label &quot;</span> &lt;&lt; get<span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">,</span> EIP<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L25" class="LineNr">25 </span>  <a href='003trace.cc.html#L96'>trace</a><span class="Delimiter">(</span><span class="Special">Callstack_depth</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;== label &quot;</span> &lt;&lt; get<span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">,</span> EIP<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L26" class="LineNr">26 </span>
-<span id="L27" class="LineNr">27 </span><span class="Comment">//: If a label starts with '$watch-', make a note of the effective address</span>
-<span id="L28" class="LineNr">28 </span><span class="Comment">//: computed by the next instruction. Start dumping out its contents to the</span>
-<span id="L29" class="LineNr">29 </span><span class="Comment">//: trace after every subsequent instruction.</span>
-<span id="L30" class="LineNr">30 </span>
-<span id="L31" class="LineNr">31 </span><span class="Delimiter">:(after &quot;Run One Instruction&quot;)</span>
-<span id="L32" class="LineNr">32 </span><a href='039debug.cc.html#L38'>dump_watch_points</a><span class="Delimiter">();</span>
-<span id="L33" class="LineNr">33 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L34" class="LineNr">34 </span>map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt; <span class="Special"><a href='039debug.cc.html#L34'>Watch_points</a></span><span class="Delimiter">;</span>
-<span id="L35" class="LineNr">35 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
-<span id="L36" class="LineNr">36 </span><span class="Special"><a href='039debug.cc.html#L34'>Watch_points</a></span><span class="Delimiter">.</span>clear<span class="Delimiter">();</span>
-<span id="L37" class="LineNr">37 </span><span class="Delimiter">:(code)</span>
-<span id="L38" class="LineNr">38 </span><span class="Normal">void</span> <a href='039debug.cc.html#L38'>dump_watch_points</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L39" class="LineNr">39 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L34'>Watch_points</a></span><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L40" class="LineNr">40 </span>  <a href='003trace.cc.html#L406'>dbg</a> &lt;&lt; <span class="Constant">&quot;watch points:&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L41" class="LineNr">41 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt;::iterator p = <span class="Special"><a href='039debug.cc.html#L34'>Watch_points</a></span><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special"><a href='039debug.cc.html#L34'>Watch_points</a></span><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L42" class="LineNr">42 </span>    <a href='003trace.cc.html#L406'>dbg</a> &lt;&lt; <span class="Constant">&quot;  &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; p<span class="Delimiter">-&gt;</span>second &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L209'>read_mem_u32</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L43" class="LineNr">43 </span><span class="Delimiter">}</span>
-<span id="L44" class="LineNr">44 </span>
-<span id="L45" class="LineNr">45 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L46" class="LineNr">46 </span>string <span class="Special">Watch_this_effective_address</span><span class="Delimiter">;</span>
-<span id="L47" class="LineNr">47 </span><span class="Delimiter">:(after &quot;Run One Instruction&quot;)</span>
-<span id="L48" class="LineNr">48 </span><span class="Special">Watch_this_effective_address</span> = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L49" class="LineNr">49 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L256'>contains_key</a><span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">,</span> EIP<span class="Delimiter">)</span> &amp;&amp; <a href='001help.cc.html#L102'>starts_with</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">,</span> EIP<span class="Delimiter">),</span> <span class="Constant">&quot;$watch-&quot;</span><span class="Delimiter">))</span>
-<span id="L50" class="LineNr">50 </span>  <span class="Special">Watch_this_effective_address</span> = get<span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">,</span> EIP<span class="Delimiter">);</span>
-<span id="L51" class="LineNr">51 </span><span class="Delimiter">:(after &quot;Found effective_address(addr)&quot;)</span>
-<span id="L52" class="LineNr">52 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!<span class="Special">Watch_this_effective_address</span><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L53" class="LineNr">53 </span>  <a href='003trace.cc.html#L406'>dbg</a> &lt;&lt; <span class="Constant">&quot;now watching &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L433'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; for &quot;</span> &lt;&lt; <span class="Special">Watch_this_effective_address</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L54" class="LineNr">54 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L34'>Watch_points</a></span><span class="Delimiter">,</span> <span class="Special">Watch_this_effective_address</span><span class="Delimiter">,</span> addr<span class="Delimiter">);</span>
-<span id="L55" class="LineNr">55 </span><span class="Delimiter">}</span>
+<span id="L27" class="LineNr">27 </span><span class="Comment">//: make calls in particular more salient</span>
+<span id="L28" class="LineNr">28 </span><span class="Delimiter">:(before &quot;End Trace Call Instruction&quot;)</span>
+<span id="L29" class="LineNr">29 </span><span class="Comment">// at this point we've skipped past the e8 opcode, but not the offset operand</span>
+<span id="L30" class="LineNr">30 </span><span class="Normal">int32_t</span> <a href='039debug.cc.html#L30'>offset</a> = <a href='010---vm.cc.html#L213'>read_mem_i32</a><span class="Delimiter">(</span>EIP<span class="Delimiter">);</span>
+<span id="L31" class="LineNr">31 </span><span class="Normal">uint32_t</span> <a href='039debug.cc.html#L31'>next_eip</a> = EIP+offset+<span class="Constant">4</span><span class="Delimiter">;</span>
+<span id="L32" class="LineNr">32 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L256'>contains_key</a><span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">,</span> <a href='039debug.cc.html#L31'>next_eip</a><span class="Delimiter">))</span>
+<span id="L33" class="LineNr">33 </span>  <span class="Identifier">return</span> <span class="Constant">&quot;/call &quot;</span>+get<span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">,</span> <a href='039debug.cc.html#L31'>next_eip</a><span class="Delimiter">);</span>
+<span id="L34" class="LineNr">34 </span>
+<span id="L35" class="LineNr">35 </span><span class="Comment">//: If a label starts with '$watch-', make a note of the effective address</span>
+<span id="L36" class="LineNr">36 </span><span class="Comment">//: computed by the next instruction. Start dumping out its contents to the</span>
+<span id="L37" class="LineNr">37 </span><span class="Comment">//: trace after every subsequent instruction.</span>
+<span id="L38" class="LineNr">38 </span>
+<span id="L39" class="LineNr">39 </span><span class="Delimiter">:(after &quot;Run One Instruction&quot;)</span>
+<span id="L40" class="LineNr">40 </span><a href='039debug.cc.html#L46'>dump_watch_points</a><span class="Delimiter">();</span>
+<span id="L41" class="LineNr">41 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L42" class="LineNr">42 </span>map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt; <span class="Special"><a href='039debug.cc.html#L42'>Watch_points</a></span><span class="Delimiter">;</span>
+<span id="L43" class="LineNr">43 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
+<span id="L44" class="LineNr">44 </span><span class="Special"><a href='039debug.cc.html#L42'>Watch_points</a></span><span class="Delimiter">.</span>clear<span class="Delimiter">();</span>
+<span id="L45" class="LineNr">45 </span><span class="Delimiter">:(code)</span>
+<span id="L46" class="LineNr">46 </span><span class="Normal">void</span> <a href='039debug.cc.html#L46'>dump_watch_points</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L47" class="LineNr">47 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L42'>Watch_points</a></span><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L48" class="LineNr">48 </span>  <a href='003trace.cc.html#L414'>dbg</a> &lt;&lt; <span class="Constant">&quot;watch points:&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L49" class="LineNr">49 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt;::iterator p = <span class="Special"><a href='039debug.cc.html#L42'>Watch_points</a></span><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special"><a href='039debug.cc.html#L42'>Watch_points</a></span><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L50" class="LineNr">50 </span>    <a href='003trace.cc.html#L414'>dbg</a> &lt;&lt; <span class="Constant">&quot;  &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; p<span class="Delimiter">-&gt;</span>second &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L209'>read_mem_u32</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L51" class="LineNr">51 </span><span class="Delimiter">}</span>
+<span id="L52" class="LineNr">52 </span>
+<span id="L53" class="LineNr">53 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L54" class="LineNr">54 </span>string <span class="Special">Watch_this_effective_address</span><span class="Delimiter">;</span>
+<span id="L55" class="LineNr">55 </span><span class="Delimiter">:(after &quot;Run One Instruction&quot;)</span>
+<span id="L56" class="LineNr">56 </span><span class="Special">Watch_this_effective_address</span> = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L57" class="LineNr">57 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L256'>contains_key</a><span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">,</span> EIP<span class="Delimiter">)</span> &amp;&amp; <a href='001help.cc.html#L102'>starts_with</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">,</span> EIP<span class="Delimiter">),</span> <span class="Constant">&quot;$watch-&quot;</span><span class="Delimiter">))</span>
+<span id="L58" class="LineNr">58 </span>  <span class="Special">Watch_this_effective_address</span> = get<span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">,</span> EIP<span class="Delimiter">);</span>
+<span id="L59" class="LineNr">59 </span><span class="Delimiter">:(after &quot;Found effective_address(addr)&quot;)</span>
+<span id="L60" class="LineNr">60 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!<span class="Special">Watch_this_effective_address</span><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L61" class="LineNr">61 </span>  <a href='003trace.cc.html#L414'>dbg</a> &lt;&lt; <span class="Constant">&quot;now watching &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L440'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; for &quot;</span> &lt;&lt; <span class="Special">Watch_this_effective_address</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L62" class="LineNr">62 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L42'>Watch_points</a></span><span class="Delimiter">,</span> <span class="Special">Watch_this_effective_address</span><span class="Delimiter">,</span> addr<span class="Delimiter">);</span>
+<span id="L63" class="LineNr">63 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/040---tests.cc.html b/html/subx/040---tests.cc.html
index de361848..92c062af 100644
--- a/html/subx/040---tests.cc.html
+++ b/html/subx/040---tests.cc.html
@@ -14,8 +14,6 @@ pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-
 body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
-.traceContains { color: #005f00; }
 .LineNr { }
 .Constant { color: #008787; }
 .Delimiter { color: #c000c0; }
@@ -23,7 +21,7 @@ a { color:inherit; }
 .Identifier { color: #af5f00; }
 .Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 .Comment { color: #005faf; }
-.PreProc { color: #c000c0; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
@@ -72,86 +70,89 @@ if ('onhashchange' in window) {
 <span id="L11" class="LineNr">11 </span><span class="Comment">//: knows about labels and will emit labels for previous layers to transform.</span>
 <span id="L12" class="LineNr">12 </span><span class="Delimiter">:(after &quot;Begin Transforms&quot;)</span>
 <span id="L13" class="LineNr">13 </span><span class="Comment">// Begin Level-4 Transforms</span>
-<span id="L14" class="LineNr">14 </span><span class="Special"><a href='011run.cc.html#L224'>Transform</a></span><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>create_test_function<span class="Delimiter">);</span>
+<span id="L14" class="LineNr">14 </span><span class="Special"><a href='011run.cc.html#L235'>Transform</a></span><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='040---tests.cc.html#L35'>create_test_function</a><span class="Delimiter">);</span>
 <span id="L15" class="LineNr">15 </span><span class="Comment">// End Level-4 Transforms</span>
 <span id="L16" class="LineNr">16 </span>
-<span id="L17" class="LineNr">17 </span><span class="Delimiter">:(scenario run_test)</span>
-<span id="L18" class="LineNr">18 </span><span class="Special">% Reg[ESP].u = 0x100;</span>
-<span id="L19" class="LineNr">19 </span>== <span class="Constant">0x1</span>
-<span id="L20" class="LineNr">20 </span><span class="Normal"><a href='000organization.cc.html#L113'>main</a></span>:
-<span id="L21" class="LineNr">21 </span>  e8/call run-tests/disp32  <span class="Comment"># 5 bytes</span>
-<span id="L22" class="LineNr">22 </span>  f4/halt                   <span class="Comment"># 1 byte</span>
-<span id="L23" class="LineNr">23 </span>
-<span id="L24" class="LineNr">24 </span>test-foo:  <span class="Comment"># offset 7</span>
-<span id="L25" class="LineNr">25 </span>  <span class="PreProc">0</span><span class="Constant">1</span> d8  <span class="Comment"># just some unique instruction: add EBX to EAX</span>
-<span id="L26" class="LineNr">26 </span>  c3/<span class="Identifier">return</span>
-<span id="L27" class="LineNr">27 </span>
-<span id="L28" class="LineNr">28 </span><span class="Comment"># check that code in test-foo ran (implicitly called by run-tests)</span>
-<span id="L29" class="LineNr">29 </span><span class="traceContains">+run: 0x00000007 opcode: 01</span>
-<span id="L30" class="LineNr">30 </span>
-<span id="L31" class="LineNr">31 </span><span class="Delimiter">:(code)</span>
-<span id="L32" class="LineNr">32 </span><span class="Normal">void</span> create_test_function<span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L33" class="LineNr">33 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L34" class="LineNr">34 </span>  segment&amp; <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L96'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L35" class="LineNr">35 </span>  <a href='003trace.cc.html#L98'>trace</a><span class="Delimiter">(</span><span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- create 'run-tests'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L36" class="LineNr">36 </span>  vector&lt;line&gt; <a href='040---tests.cc.html#L36'>new_insts</a><span class="Delimiter">;</span>
-<span id="L37" class="LineNr">37 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L38" class="LineNr">38 </span>    line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<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> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L40" class="LineNr">40 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
-<span id="L41" class="LineNr">41 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span>data<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> != <span class="Constant">':'</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// not a label</span>
-<span id="L42" class="LineNr">42 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!starts_with<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">,</span> <span class="Constant">&quot;test-&quot;</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L43" class="LineNr">43 </span>      string fn = <a href='035labels.cc.html#L234'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L44" class="LineNr">44 </span>      <a href='040---tests.cc.html#L36'>new_insts</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>call<span class="Delimiter">(</span>fn<span class="Delimiter">));</span>
-<span id="L45" class="LineNr">45 </span>    <span class="Delimiter">}</span>
-<span id="L46" class="LineNr">46 </span>  <span class="Delimiter">}</span>
-<span id="L47" class="LineNr">47 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='040---tests.cc.html#L36'>new_insts</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// no tests found</span>
-<span id="L48" class="LineNr">48 </span>  <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>label<span class="Delimiter">(</span><span class="Constant">&quot;run-tests&quot;</span><span class="Delimiter">));</span>
-<span id="L49" class="LineNr">49 </span>  <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>end<span class="Delimiter">(),</span> <a href='040---tests.cc.html#L36'>new_insts</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> <a href='040---tests.cc.html#L36'>new_insts</a><span class="Delimiter">.</span>end<span class="Delimiter">());</span>
-<span id="L50" class="LineNr">50 </span>  <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>ret<span class="Delimiter">());</span>
-<span id="L51" class="LineNr">51 </span><span class="Delimiter">}</span>
-<span id="L52" class="LineNr">52 </span>
-<span id="L53" class="LineNr">53 </span>string to_string<span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L54" class="LineNr">54 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L55" class="LineNr">55 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L56" class="LineNr">56 </span>    <span class="Normal">const</span> line&amp; l = s<span class="Delimiter">.</span><a href='011run.cc.html#L105'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L57" class="LineNr">57 </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#L166'>SIZE</a><span class="Delimiter">(</span>l<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L58" class="LineNr">58 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>j &gt; <span class="Constant">0</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
-<span id="L59" class="LineNr">59 </span>      out &lt;&lt; to_string<span class="Delimiter">(</span>l<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">));</span>
-<span id="L60" class="LineNr">60 </span>    <span class="Delimiter">}</span>
-<span id="L61" class="LineNr">61 </span>    out &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L62" class="LineNr">62 </span>  <span class="Delimiter">}</span>
-<span id="L63" class="LineNr">63 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L64" class="LineNr">64 </span><span class="Delimiter">}</span>
-<span id="L65" class="LineNr">65 </span>
-<span id="L66" class="LineNr">66 </span><a href='011run.cc.html#L113'>line</a> call<span class="Delimiter">(</span>string s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L67" class="LineNr">67 </span>  <a href='011run.cc.html#L113'>line</a> result<span class="Delimiter">;</span>
-<span id="L68" class="LineNr">68 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>call<span class="Delimiter">());</span>
-<span id="L69" class="LineNr">69 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>disp32<span class="Delimiter">(</span>s<span class="Delimiter">));</span>
-<span id="L70" class="LineNr">70 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L71" class="LineNr">71 </span><span class="Delimiter">}</span>
-<span id="L72" class="LineNr">72 </span>
-<span id="L73" class="LineNr">73 </span><a href='011run.cc.html#L119'>word</a> call<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L74" class="LineNr">74 </span>  <a href='011run.cc.html#L119'>word</a> result<span class="Delimiter">;</span>
-<span id="L75" class="LineNr">75 </span>  result<span class="Delimiter">.</span>data = <span class="Constant">&quot;e8&quot;</span><span class="Delimiter">;</span>
-<span id="L76" class="LineNr">76 </span>  result<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><span class="Constant">&quot;call&quot;</span><span class="Delimiter">);</span>
-<span id="L77" class="LineNr">77 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L78" class="LineNr">78 </span><span class="Delimiter">}</span>
-<span id="L79" class="LineNr">79 </span>
-<span id="L80" class="LineNr">80 </span><a href='011run.cc.html#L119'>word</a> disp32<span class="Delimiter">(</span>string s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L81" class="LineNr">81 </span>  <a href='011run.cc.html#L119'>word</a> result<span class="Delimiter">;</span>
-<span id="L82" class="LineNr">82 </span>  result<span class="Delimiter">.</span>data = s<span class="Delimiter">;</span>
-<span id="L83" class="LineNr">83 </span>  result<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">);</span>
-<span id="L84" class="LineNr">84 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L85" class="LineNr">85 </span><span class="Delimiter">}</span>
-<span id="L86" class="LineNr">86 </span>
-<span id="L87" class="LineNr">87 </span><a href='011run.cc.html#L113'>line</a> ret<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L88" class="LineNr">88 </span>  <a href='011run.cc.html#L113'>line</a> result<span class="Delimiter">;</span>
-<span id="L89" class="LineNr">89 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L119'>word</a><span class="Delimiter">());</span>
-<span id="L90" class="LineNr">90 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = <span class="Constant">&quot;c3&quot;</span><span class="Delimiter">;</span>
-<span id="L91" class="LineNr">91 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L114'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><span class="Constant">&quot;return&quot;</span><span class="Delimiter">);</span>
-<span id="L92" class="LineNr">92 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L93" class="LineNr">93 </span><span class="Delimiter">}</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> <a href='040---tests.cc.html#L18'>test_run_test</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L19" class="LineNr">19 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u = <span class="Constant">0x100</span><span class="Delimiter">;</span>
+<span id="L20" class="LineNr">20 </span>  <a href='011run.cc.html#L86'>run</a><span class="Delimiter">(</span>
+<span id="L21" class="LineNr">21 </span>      <span class="Constant">&quot;== 0x1\n&quot;</span>  <span class="Comment">// code segment</span>
+<span id="L22" class="LineNr">22 </span>      <span class="Constant">&quot;main:\n&quot;</span>
+<span id="L23" class="LineNr">23 </span>      <span class="Constant">&quot;  e8/call run-tests/disp32\n&quot;</span>  <span class="Comment">// 5 bytes</span>
+<span id="L24" class="LineNr">24 </span>      <span class="Constant">&quot;  f4/halt\n&quot;</span>                   <span class="Comment">// 1 byte</span>
+<span id="L25" class="LineNr">25 </span>      <span class="Constant">&quot;test-foo:\n&quot;</span>  <span class="Comment">// offset 7</span>
+<span id="L26" class="LineNr">26 </span>      <span class="Constant">&quot;  01 d8\n&quot;</span>  <span class="Comment">// just some unique instruction: add EBX to EAX</span>
+<span id="L27" class="LineNr">27 </span>      <span class="Constant">&quot;  c3/return\n&quot;</span>
+<span id="L28" class="LineNr">28 </span>  <span class="Delimiter">);</span>
+<span id="L29" class="LineNr">29 </span>  <span class="Comment">// check that code in test-foo ran (implicitly called by run-tests)</span>
+<span id="L30" class="LineNr">30 </span>  <a href='003trace.cc.html#L266'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L31" class="LineNr">31 </span>      <span class="Constant">&quot;run: 0x00000007 opcode: 01\n&quot;</span>
+<span id="L32" class="LineNr">32 </span>  <span class="Delimiter">);</span>
+<span id="L33" class="LineNr">33 </span><span class="Delimiter">}</span>
+<span id="L34" class="LineNr">34 </span>
+<span id="L35" class="LineNr">35 </span><span class="Normal">void</span> <a href='040---tests.cc.html#L35'>create_test_function</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L36" class="LineNr">36 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L37" class="LineNr">37 </span>  segment&amp; code = p<span class="Delimiter">.</span><a href='011run.cc.html#L103'>segments</a><span class="Delimiter">.</span>at<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#L96'>trace</a><span class="Delimiter">(</span><span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- create 'run-tests'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L39" class="LineNr">39 </span>  vector&lt;line&gt; new_insts<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> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>code<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L41" class="LineNr">41 </span>    line&amp; inst = code<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L42" class="LineNr">42 </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#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L43" class="LineNr">43 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
+<span id="L44" class="LineNr">44 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span>data<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> != <span class="Constant">':'</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// not a label</span>
+<span id="L45" class="LineNr">45 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!starts_with<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">,</span> <span class="Constant">&quot;test-&quot;</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L46" class="LineNr">46 </span>      string fn = <a href='035labels.cc.html#L258'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L47" class="LineNr">47 </span>      new_insts<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>call<span class="Delimiter">(</span>fn<span class="Delimiter">));</span>
+<span id="L48" class="LineNr">48 </span>    <span class="Delimiter">}</span>
+<span id="L49" class="LineNr">49 </span>  <span class="Delimiter">}</span>
+<span id="L50" class="LineNr">50 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>new_insts<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// no tests found</span>
+<span id="L51" class="LineNr">51 </span>  code<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>label<span class="Delimiter">(</span><span class="Constant">&quot;run-tests&quot;</span><span class="Delimiter">));</span>
+<span id="L52" class="LineNr">52 </span>  code<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span>code<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>end<span class="Delimiter">(),</span> new_insts<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> new_insts<span class="Delimiter">.</span>end<span class="Delimiter">());</span>
+<span id="L53" class="LineNr">53 </span>  code<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='040---tests.cc.html#L90'>ret</a><span class="Delimiter">());</span>
+<span id="L54" class="LineNr">54 </span><span class="Delimiter">}</span>
+<span id="L55" class="LineNr">55 </span>
+<span id="L56" class="LineNr">56 </span>string to_string<span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L57" class="LineNr">57 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L58" class="LineNr">58 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L59" class="LineNr">59 </span>    <span class="Normal">const</span> line&amp; l = s<span class="Delimiter">.</span><a href='011run.cc.html#L112'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L60" class="LineNr">60 </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#L166'>SIZE</a><span class="Delimiter">(</span>l<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L61" class="LineNr">61 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>j &gt; <span class="Constant">0</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
+<span id="L62" class="LineNr">62 </span>      out &lt;&lt; to_string<span class="Delimiter">(</span>l<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">));</span>
+<span id="L63" class="LineNr">63 </span>    <span class="Delimiter">}</span>
+<span id="L64" class="LineNr">64 </span>    out &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L65" class="LineNr">65 </span>  <span class="Delimiter">}</span>
+<span id="L66" class="LineNr">66 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L67" class="LineNr">67 </span><span class="Delimiter">}</span>
+<span id="L68" class="LineNr">68 </span>
+<span id="L69" class="LineNr">69 </span><a href='011run.cc.html#L120'>line</a> call<span class="Delimiter">(</span>string s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L70" class="LineNr">70 </span>  <a href='011run.cc.html#L120'>line</a> result<span class="Delimiter">;</span>
+<span id="L71" class="LineNr">71 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>call<span class="Delimiter">());</span>
+<span id="L72" class="LineNr">72 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='040---tests.cc.html#L83'>disp32</a><span class="Delimiter">(</span>s<span class="Delimiter">));</span>
+<span id="L73" class="LineNr">73 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L74" class="LineNr">74 </span><span class="Delimiter">}</span>
+<span id="L75" class="LineNr">75 </span>
+<span id="L76" class="LineNr">76 </span><a href='011run.cc.html#L126'>word</a> call<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L77" class="LineNr">77 </span>  <a href='011run.cc.html#L126'>word</a> result<span class="Delimiter">;</span>
+<span id="L78" class="LineNr">78 </span>  result<span class="Delimiter">.</span>data = <span class="Constant">&quot;e8&quot;</span><span class="Delimiter">;</span>
+<span id="L79" class="LineNr">79 </span>  result<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><span class="Constant">&quot;call&quot;</span><span class="Delimiter">);</span>
+<span id="L80" class="LineNr">80 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L81" class="LineNr">81 </span><span class="Delimiter">}</span>
+<span id="L82" class="LineNr">82 </span>
+<span id="L83" class="LineNr">83 </span><a href='011run.cc.html#L126'>word</a> <a href='040---tests.cc.html#L83'>disp32</a><span class="Delimiter">(</span>string s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L84" class="LineNr">84 </span>  <a href='011run.cc.html#L126'>word</a> result<span class="Delimiter">;</span>
+<span id="L85" class="LineNr">85 </span>  result<span class="Delimiter">.</span>data = s<span class="Delimiter">;</span>
+<span id="L86" class="LineNr">86 </span>  result<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">);</span>
+<span id="L87" class="LineNr">87 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L88" class="LineNr">88 </span><span class="Delimiter">}</span>
+<span id="L89" class="LineNr">89 </span>
+<span id="L90" class="LineNr">90 </span><a href='011run.cc.html#L120'>line</a> <a href='040---tests.cc.html#L90'>ret</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L91" class="LineNr">91 </span>  <a href='011run.cc.html#L120'>line</a> result<span class="Delimiter">;</span>
+<span id="L92" class="LineNr">92 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L126'>word</a><span class="Delimiter">());</span>
+<span id="L93" class="LineNr">93 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = <span class="Constant">&quot;c3&quot;</span><span class="Delimiter">;</span>
+<span id="L94" class="LineNr">94 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L121'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><span class="Constant">&quot;return&quot;</span><span class="Delimiter">);</span>
+<span id="L95" class="LineNr">95 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L96" class="LineNr">96 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/052kernel-string-equal.subx.html b/html/subx/052kernel-string-equal.subx.html
index f1258e3c..ab05597e 100644
--- a/html/subx/052kernel-string-equal.subx.html
+++ b/html/subx/052kernel-string-equal.subx.html
@@ -145,7 +145,7 @@ if ('onhashchange' in window) {
 <span id="L83" class="LineNr"> 83 </span>    3d/compare-EAX  0/imm32
 <span id="L84" class="LineNr"> 84 </span>    74/jump-if-equal  $kernel-string-equal?:false/disp8
 <span id="L85" class="LineNr"> 85 </span>    <span class="subxComment"># if (c1 != c2) return false</span>
-<span id="L86" class="LineNr"> 86 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX with EBX</span>
+<span id="L86" class="LineNr"> 86 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX and EBX</span>
 <span id="L87" class="LineNr"> 87 </span>    75/jump-if-not-equal  $kernel-string-equal?:false/disp8
 <span id="L88" class="LineNr"> 88 </span>    <span class="subxComment"># ++i</span>
 <span id="L89" class="LineNr"> 89 </span>    41/inc-ECX
diff --git a/html/subx/054string-equal.subx.html b/html/subx/054string-equal.subx.html
index d03ed04a..a4f8919c 100644
--- a/html/subx/054string-equal.subx.html
+++ b/html/subx/054string-equal.subx.html
@@ -82,7 +82,7 @@ if ('onhashchange' in window) {
 <span id="L20" class="LineNr"> 20 </span>    <span class="subxComment">#   i = 0</span>
 <span id="L21" class="LineNr"> 21 </span>    <span class="subxComment">#   currs = s-&gt;data</span>
 <span id="L22" class="LineNr"> 22 </span>    <span class="subxComment">#   currb = benchmark-&gt;data</span>
-<span id="L23" class="LineNr"> 23 </span>    <span class="subxComment">#   while (i &lt; s-&gt;length)</span>
+<span id="L23" class="LineNr"> 23 </span>    <span class="subxComment">#   while i &lt; s-&gt;length</span>
 <span id="L24" class="LineNr"> 24 </span>    <span class="subxComment">#     c1 = *currs</span>
 <span id="L25" class="LineNr"> 25 </span>    <span class="subxComment">#     c2 = *currb</span>
 <span id="L26" class="LineNr"> 26 </span>    <span class="subxComment">#     if (c1 != c2) return false</span>
@@ -114,7 +114,7 @@ if ('onhashchange' in window) {
 <span id="L52" class="LineNr"> 52 </span>    8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ESI to EDX</span>
 <span id="L53" class="LineNr"> 53 </span><span class="Constant">$string-equal?:lengths</span>:
 <span id="L54" class="LineNr"> 54 </span>    <span class="subxComment"># if (lens != benchmark-&gt;length) return false</span>
-<span id="L55" class="LineNr"> 55 </span>    39/compare                      0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare *EDI with EDX</span>
+<span id="L55" class="LineNr"> 55 </span>    39/compare                      0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare *EDI and EDX</span>
 <span id="L56" class="LineNr"> 56 </span>    75/jump-if-not-equal  $string-equal?:false/disp8
 <span id="L57" class="LineNr"> 57 </span>    <span class="subxComment"># currs/ESI = s-&gt;data</span>
 <span id="L58" class="LineNr"> 58 </span>    81          0/subop/add         3/mod/direct    6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESI</span>
@@ -133,7 +133,7 @@ if ('onhashchange' in window) {
 <span id="L71" class="LineNr"> 71 </span>    <span class="subxComment"># c2 = *currb</span>
 <span id="L72" class="LineNr"> 72 </span>    8a/copy-byte                    0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/BL   <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *EDI to BL</span>
 <span id="L73" class="LineNr"> 73 </span>    <span class="subxComment"># if (c1 != c2) return false</span>
-<span id="L74" class="LineNr"> 74 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX with EBX</span>
+<span id="L74" class="LineNr"> 74 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX and EBX</span>
 <span id="L75" class="LineNr"> 75 </span>    75/jump-if-not-equal  $string-equal?:false/disp8
 <span id="L76" class="LineNr"> 76 </span>    <span class="subxComment"># ++i</span>
 <span id="L77" class="LineNr"> 77 </span>    41/inc-ECX
diff --git a/html/subx/058stream-equal.subx.html b/html/subx/058stream-equal.subx.html
index c54c0e56..4737a3bd 100644
--- a/html/subx/058stream-equal.subx.html
+++ b/html/subx/058stream-equal.subx.html
@@ -6,11 +6,11 @@
 <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-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
 body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
@@ -85,651 +85,654 @@ if ('onhashchange' in window) {
 <span id="L24" class="LineNr"> 24 </span>    57/push-EDI
 <span id="L25" class="LineNr"> 25 </span>    <span class="subxComment"># ESI = f</span>
 <span id="L26" class="LineNr"> 26 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
-<span id="L27" class="LineNr"> 27 </span>    <span class="subxComment"># max/EDX = f-&gt;data + f-&gt;write</span>
+<span id="L27" class="LineNr"> 27 </span>    <span class="subxComment"># EAX = f-&gt;write</span>
 <span id="L28" class="LineNr"> 28 </span>    8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ESI to EAX</span>
-<span id="L29" class="LineNr"> 29 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  0/index/EAX  <span class="Normal"> . </span>          2/r32/EDX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy ESI+EAX+12 to EDX</span>
-<span id="L30" class="LineNr"> 30 </span>    <span class="subxComment"># currf/ESI = f-&gt;data</span>
-<span id="L31" class="LineNr"> 31 </span>    81          0/subop/add         3/mod/direct    6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESI</span>
-<span id="L32" class="LineNr"> 32 </span>    <span class="subxComment"># EDI = s</span>
-<span id="L33" class="LineNr"> 33 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          7/r32/EDI   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDI</span>
-<span id="L34" class="LineNr"> 34 </span>    <span class="subxComment"># if (f-&gt;write != s-&gt;length) return false</span>
-<span id="L35" class="LineNr"> 35 </span>    39/compare                      0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare *EDI and EAX</span>
-<span id="L36" class="LineNr"> 36 </span>    75/jump-if-not-equal  $stream-data-equal?:false/disp8
-<span id="L37" class="LineNr"> 37 </span>    <span class="subxComment"># currs/EDI = s-&gt;data</span>
-<span id="L38" class="LineNr"> 38 </span>    81          0/subop/add         3/mod/direct    7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to EDI</span>
-<span id="L39" class="LineNr"> 39 </span>    <span class="subxComment"># EAX = ECX = 0</span>
-<span id="L40" class="LineNr"> 40 </span>    31/xor                          3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EAX</span>
-<span id="L41" class="LineNr"> 41 </span>    31/xor                          3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear ECX</span>
-<span id="L42" class="LineNr"> 42 </span><span class="Constant">$stream-data-equal?:loop</span>:
-<span id="L43" class="LineNr"> 43 </span>    <span class="subxComment"># if (curr &gt;= max) return true</span>
-<span id="L44" class="LineNr"> 44 </span>    39/compare                      3/mod/direct    6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare ESI with EDX</span>
-<span id="L45" class="LineNr"> 45 </span>    7d/jump-if-greater-or-equal  $stream-data-equal?:true/disp8
-<span id="L46" class="LineNr"> 46 </span>    <span class="subxComment"># AL = *currs</span>
-<span id="L47" class="LineNr"> 47 </span>    8a/copy-byte                    0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/AL   <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *ESI to AL</span>
-<span id="L48" class="LineNr"> 48 </span>    <span class="subxComment"># CL = *curr</span>
-<span id="L49" class="LineNr"> 49 </span>    8a/copy-byte                    0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/CL   <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *EDI to CL</span>
-<span id="L50" class="LineNr"> 50 </span>    <span class="subxComment"># if (EAX != ECX) return false</span>
-<span id="L51" class="LineNr"> 51 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX and ECX</span>
-<span id="L52" class="LineNr"> 52 </span>    75/jump-if-not-equal  $stream-data-equal?:false/disp8
-<span id="L53" class="LineNr"> 53 </span>    <span class="subxComment"># ++f</span>
-<span id="L54" class="LineNr"> 54 </span>    46/increment-ESI
-<span id="L55" class="LineNr"> 55 </span>    <span class="subxComment"># ++curr</span>
-<span id="L56" class="LineNr"> 56 </span>    47/increment-EDI
-<span id="L57" class="LineNr"> 57 </span>    eb/jump $stream-data-equal?:loop/disp8
-<span id="L58" class="LineNr"> 58 </span><span class="Constant">$stream-data-equal?:false</span>:
-<span id="L59" class="LineNr"> 59 </span>    b8/copy-to-EAX  0/imm32
-<span id="L60" class="LineNr"> 60 </span>    eb/jump  $stream-data-equal?:end/disp8
-<span id="L61" class="LineNr"> 61 </span><span class="Constant">$stream-data-equal?:true</span>:
-<span id="L62" class="LineNr"> 62 </span>    b8/copy-to-EAX  1/imm32
-<span id="L63" class="LineNr"> 63 </span><span class="Constant">$stream-data-equal?:end</span>:
-<span id="L64" class="LineNr"> 64 </span>    <span class="subxS1Comment"># . restore registers</span>
-<span id="L65" class="LineNr"> 65 </span>    5f/pop-to-EDI
-<span id="L66" class="LineNr"> 66 </span>    5e/pop-to-ESI
-<span id="L67" class="LineNr"> 67 </span>    5a/pop-to-EDX
-<span id="L68" class="LineNr"> 68 </span>    59/pop-to-ECX
-<span id="L69" class="LineNr"> 69 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L70" class="LineNr"> 70 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L71" class="LineNr"> 71 </span>    5d/pop-to-EBP
-<span id="L72" class="LineNr"> 72 </span>    c3/return
-<span id="L73" class="LineNr"> 73 </span>
-<span id="L74" class="LineNr"> 74 </span><span class="subxTest">test-stream-data-equal</span>:
-<span id="L75" class="LineNr"> 75 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L76" class="LineNr"> 76 </span>    55/push-EBP
-<span id="L77" class="LineNr"> 77 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L78" class="LineNr"> 78 </span>    <span class="subxComment"># clear-stream(_test-stream)</span>
-<span id="L79" class="LineNr"> 79 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L80" class="LineNr"> 80 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L81" class="LineNr"> 81 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L82" class="LineNr"> 82 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L83" class="LineNr"> 83 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L84" class="LineNr"> 84 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L85" class="LineNr"> 85 </span>    <span class="subxComment"># write(_test-stream, &quot;Abc&quot;)</span>
-<span id="L86" class="LineNr"> 86 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L87" class="LineNr"> 87 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
-<span id="L88" class="LineNr"> 88 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L89" class="LineNr"> 89 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L90" class="LineNr"> 90 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
-<span id="L91" class="LineNr"> 91 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L92" class="LineNr"> 92 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L93" class="LineNr"> 93 </span>    <span class="subxComment"># EAX = stream-data-equal?(_test-stream, &quot;Abc&quot;)</span>
-<span id="L94" class="LineNr"> 94 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L95" class="LineNr"> 95 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
-<span id="L96" class="LineNr"> 96 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L97" class="LineNr"> 97 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L98" class="LineNr"> 98 </span>    e8/call  <a href='058stream-equal.subx.html#L16'>stream-data-equal?</a>/disp32
-<span id="L99" class="LineNr"> 99 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L100" class="LineNr">100 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L101" class="LineNr">101 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
-<span id="L102" class="LineNr">102 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L103" class="LineNr">103 </span>    68/push  <span class="Constant">&quot;F - test-stream-data-equal&quot;</span>/imm32
-<span id="L104" class="LineNr">104 </span>    68/push  1/imm32
-<span id="L105" class="LineNr">105 </span>    50/push-EAX
-<span id="L106" class="LineNr">106 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L107" class="LineNr">107 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L108" class="LineNr">108 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L109" class="LineNr">109 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L110" class="LineNr">110 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L111" class="LineNr">111 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L112" class="LineNr">112 </span>    5d/pop-to-EBP
-<span id="L113" class="LineNr">113 </span>    c3/return
-<span id="L114" class="LineNr">114 </span>
-<span id="L115" class="LineNr">115 </span><span class="subxTest">test-stream-data-equal-2</span>:
-<span id="L116" class="LineNr">116 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L117" class="LineNr">117 </span>    55/push-EBP
-<span id="L118" class="LineNr">118 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L119" class="LineNr">119 </span>    <span class="subxComment"># clear-stream(_test-stream)</span>
-<span id="L120" class="LineNr">120 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L121" class="LineNr">121 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L122" class="LineNr">122 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L123" class="LineNr">123 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L124" class="LineNr">124 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L125" class="LineNr">125 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L126" class="LineNr">126 </span>    <span class="subxComment"># write(_test-stream, &quot;Abc&quot;)</span>
-<span id="L127" class="LineNr">127 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L128" class="LineNr">128 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
-<span id="L129" class="LineNr">129 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L130" class="LineNr">130 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L131" class="LineNr">131 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
-<span id="L132" class="LineNr">132 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L133" class="LineNr">133 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L134" class="LineNr">134 </span>    <span class="subxComment"># EAX = stream-data-equal?(_test-stream, &quot;Abd&quot;)</span>
-<span id="L135" class="LineNr">135 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L136" class="LineNr">136 </span>    68/push  <span class="Constant">&quot;Abd&quot;</span>/imm32
-<span id="L137" class="LineNr">137 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L138" class="LineNr">138 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L139" class="LineNr">139 </span>    e8/call  <a href='058stream-equal.subx.html#L16'>stream-data-equal?</a>/disp32
-<span id="L140" class="LineNr">140 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L141" class="LineNr">141 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L142" class="LineNr">142 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
-<span id="L143" class="LineNr">143 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L144" class="LineNr">144 </span>    68/push  <span class="Constant">&quot;F - test-stream-data-equal-2&quot;</span>/imm32
-<span id="L145" class="LineNr">145 </span>    68/push  0/imm32
-<span id="L146" class="LineNr">146 </span>    50/push-EAX
-<span id="L147" class="LineNr">147 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L148" class="LineNr">148 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L149" class="LineNr">149 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L150" class="LineNr">150 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L151" class="LineNr">151 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L152" class="LineNr">152 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L153" class="LineNr">153 </span>    5d/pop-to-EBP
-<span id="L154" class="LineNr">154 </span>    c3/return
-<span id="L155" class="LineNr">155 </span>
-<span id="L156" class="LineNr">156 </span><span class="subxTest">test-stream-data-equal-length-check</span>:
-<span id="L157" class="LineNr">157 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L158" class="LineNr">158 </span>    55/push-EBP
-<span id="L159" class="LineNr">159 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L160" class="LineNr">160 </span>    <span class="subxComment"># clear-stream(_test-stream)</span>
-<span id="L161" class="LineNr">161 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L162" class="LineNr">162 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L163" class="LineNr">163 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L164" class="LineNr">164 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L165" class="LineNr">165 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L166" class="LineNr">166 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L167" class="LineNr">167 </span>    <span class="subxComment"># write(_test-stream, &quot;Abc&quot;)</span>
-<span id="L168" class="LineNr">168 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L169" class="LineNr">169 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
-<span id="L170" class="LineNr">170 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L171" class="LineNr">171 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L172" class="LineNr">172 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
-<span id="L173" class="LineNr">173 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L174" class="LineNr">174 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L175" class="LineNr">175 </span>    <span class="subxComment"># EAX = stream-data-equal?(_test-stream, &quot;Abcd&quot;)</span>
-<span id="L176" class="LineNr">176 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L177" class="LineNr">177 </span>    68/push  <span class="Constant">&quot;Abcd&quot;</span>/imm32
-<span id="L178" class="LineNr">178 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L179" class="LineNr">179 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L180" class="LineNr">180 </span>    e8/call  <a href='058stream-equal.subx.html#L16'>stream-data-equal?</a>/disp32
-<span id="L181" class="LineNr">181 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L182" class="LineNr">182 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L183" class="LineNr">183 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
-<span id="L184" class="LineNr">184 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L185" class="LineNr">185 </span>    68/push  <span class="Constant">&quot;F - test-stream-data-equal-length-check&quot;</span>/imm32
-<span id="L186" class="LineNr">186 </span>    68/push  0/imm32
-<span id="L187" class="LineNr">187 </span>    50/push-EAX
-<span id="L188" class="LineNr">188 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L189" class="LineNr">189 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L190" class="LineNr">190 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L191" class="LineNr">191 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L192" class="LineNr">192 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L193" class="LineNr">193 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L194" class="LineNr">194 </span>    5d/pop-to-EBP
-<span id="L195" class="LineNr">195 </span>    c3/return
-<span id="L196" class="LineNr">196 </span>
-<span id="L197" class="LineNr">197 </span><span class="subxComment"># helper for later tests</span>
-<span id="L198" class="LineNr">198 </span><span class="subxFunction">check-stream-equal</span>:  <span class="subxComment"># f : (address stream), s : (address string), msg : (address string)</span>
-<span id="L199" class="LineNr">199 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L200" class="LineNr">200 </span>    55/push-EBP
-<span id="L201" class="LineNr">201 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L202" class="LineNr">202 </span>    <span class="subxS1Comment"># . save registers</span>
-<span id="L203" class="LineNr">203 </span>    50/push-EAX
-<span id="L204" class="LineNr">204 </span>    <span class="subxComment"># EAX = stream-data-equal?(f, s)</span>
-<span id="L205" class="LineNr">205 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L206" class="LineNr">206 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
-<span id="L207" class="LineNr">207 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
-<span id="L208" class="LineNr">208 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L209" class="LineNr">209 </span>    e8/call  <a href='058stream-equal.subx.html#L16'>stream-data-equal?</a>/disp32
-<span id="L210" class="LineNr">210 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L211" class="LineNr">211 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L212" class="LineNr">212 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
-<span id="L213" class="LineNr">213 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L214" class="LineNr">214 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
-<span id="L215" class="LineNr">215 </span>    68/push  1/imm32
-<span id="L216" class="LineNr">216 </span>    50/push-EAX
-<span id="L217" class="LineNr">217 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L218" class="LineNr">218 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L219" class="LineNr">219 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L220" class="LineNr">220 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L221" class="LineNr">221 </span>    <span class="subxS1Comment"># . restore registers</span>
-<span id="L222" class="LineNr">222 </span>    58/pop-to-EAX
-<span id="L223" class="LineNr">223 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L224" class="LineNr">224 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L225" class="LineNr">225 </span>    5d/pop-to-EBP
-<span id="L226" class="LineNr">226 </span>    c3/return
-<span id="L227" class="LineNr">227 </span>
-<span id="L228" class="LineNr">228 </span><span class="subxComment"># scan the next line until newline starting from f-&gt;read and compare it with</span>
-<span id="L229" class="LineNr">229 </span><span class="subxComment"># 's' (ignoring the trailing newline)</span>
-<span id="L230" class="LineNr">230 </span><span class="subxComment"># on success, set f-&gt;read to after the next newline</span>
-<span id="L231" class="LineNr">231 </span><span class="subxComment"># on failure, leave f-&gt;read unmodified</span>
-<span id="L232" class="LineNr">232 </span><span class="subxComment"># this function is usually used only in tests, so we repeatedly write f-&gt;read</span>
-<span id="L233" class="LineNr">233 </span><span class="subxFunction">next-stream-line-equal?</span>:  <span class="subxComment"># f : (address stream), s : (address string) -&gt; EAX : boolean</span>
-<span id="L234" class="LineNr">234 </span>    <span class="subxComment"># pseudocode:</span>
-<span id="L235" class="LineNr">235 </span>    <span class="subxComment">#   currf = f-&gt;read  # bound: f-&gt;write</span>
-<span id="L236" class="LineNr">236 </span>    <span class="subxComment">#   currs = 0  # bound : s-&gt;length</span>
-<span id="L237" class="LineNr">237 </span>    <span class="subxComment">#   while true:</span>
-<span id="L238" class="LineNr">238 </span>    <span class="subxComment">#     if (currf &gt;= f-&gt;write)</span>
-<span id="L239" class="LineNr">239 </span>    <span class="subxComment">#       return currs &gt;= s-&gt;length</span>
-<span id="L240" class="LineNr">240 </span>    <span class="subxComment">#     if (f[currf] == '\n')</span>
-<span id="L241" class="LineNr">241 </span>    <span class="subxComment">#       ++currf</span>
-<span id="L242" class="LineNr">242 </span>    <span class="subxComment">#       return currs &gt;= s-&gt;length</span>
-<span id="L243" class="LineNr">243 </span>    <span class="subxComment">#     if (currs &gt;= s-&gt;length) return false  # the current line of f still has data to match</span>
-<span id="L244" class="LineNr">244 </span>    <span class="subxComment">#     if (f[currf] != s[currs]) return false</span>
-<span id="L245" class="LineNr">245 </span>    <span class="subxComment">#     ++currf</span>
-<span id="L246" class="LineNr">246 </span>    <span class="subxComment">#     ++currs</span>
-<span id="L247" class="LineNr">247 </span>    <span class="subxComment">#</span>
-<span id="L248" class="LineNr">248 </span>    <span class="subxComment"># collapsing the two branches that can return true:</span>
-<span id="L249" class="LineNr">249 </span>    <span class="subxComment">#   currf = f-&gt;read  # bound: f-&gt;write</span>
-<span id="L250" class="LineNr">250 </span>    <span class="subxComment">#   currs = 0  # bound : s-&gt;length</span>
-<span id="L251" class="LineNr">251 </span>    <span class="subxComment">#   while true:</span>
-<span id="L252" class="LineNr">252 </span>    <span class="subxComment">#     if (currf &gt;= f-&gt;write) break</span>
-<span id="L253" class="LineNr">253 </span>    <span class="subxComment">#     if (f[currf] == '\n') break</span>
-<span id="L254" class="LineNr">254 </span>    <span class="subxComment">#     if (currs &gt;= s-&gt;length) return false  # the current line of f still has data to match</span>
-<span id="L255" class="LineNr">255 </span>    <span class="subxComment">#     if (f[currf] != s[currs]) return false</span>
-<span id="L256" class="LineNr">256 </span>    <span class="subxComment">#     ++currf</span>
-<span id="L257" class="LineNr">257 </span>    <span class="subxComment">#     ++currs</span>
-<span id="L258" class="LineNr">258 </span>    <span class="subxComment">#   ++currf  # skip '\n'</span>
-<span id="L259" class="LineNr">259 </span>    <span class="subxComment">#   return currs &gt;= s-&gt;length</span>
-<span id="L260" class="LineNr">260 </span>    <span class="subxComment"># Here the final `++currf` is sometimes unnecessary (if we're already at the end of the stream)</span>
-<span id="L261" class="LineNr">261 </span>    <span class="subxComment">#</span>
-<span id="L262" class="LineNr">262 </span>    <span class="subxComment"># registers:</span>
-<span id="L263" class="LineNr">263 </span>    <span class="subxComment">#   f: ESI</span>
-<span id="L264" class="LineNr">264 </span>    <span class="subxComment">#   s: EDI</span>
-<span id="L265" class="LineNr">265 </span>    <span class="subxComment">#   currf: ECX</span>
-<span id="L266" class="LineNr">266 </span>    <span class="subxComment">#   currs: EDX</span>
-<span id="L267" class="LineNr">267 </span>    <span class="subxComment">#   f[currf]: EAX</span>
-<span id="L268" class="LineNr">268 </span>    <span class="subxComment">#   s[currs]: EBX</span>
-<span id="L269" class="LineNr">269 </span>    <span class="subxComment">#</span>
-<span id="L270" class="LineNr">270 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L271" class="LineNr">271 </span>    55/push-EBP
-<span id="L272" class="LineNr">272 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L273" class="LineNr">273 </span>    <span class="subxS1Comment"># . save registers</span>
-<span id="L274" class="LineNr">274 </span>    51/push-ECX
-<span id="L275" class="LineNr">275 </span>    52/push-EDX
-<span id="L276" class="LineNr">276 </span>    56/push-ESI
-<span id="L277" class="LineNr">277 </span>    57/push-EDI
-<span id="L278" class="LineNr">278 </span>    <span class="subxComment"># ESI = f</span>
-<span id="L279" class="LineNr">279 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
-<span id="L280" class="LineNr">280 </span>    <span class="subxComment"># currf/ECX = f-&gt;read</span>
-<span id="L281" class="LineNr">281 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESI+4) to ECX</span>
-<span id="L282" class="LineNr">282 </span>    <span class="subxComment"># EDI = s</span>
-<span id="L283" class="LineNr">283 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          7/r32/EDI   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDI</span>
-<span id="L284" class="LineNr">284 </span>    <span class="subxComment"># currs/EDX = 0</span>
-<span id="L285" class="LineNr">285 </span>    31/xor                          3/mod/direct    2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EDX</span>
-<span id="L286" class="LineNr">286 </span>    <span class="subxComment"># EAX = EBX = 0</span>
-<span id="L287" class="LineNr">287 </span>    31/xor                          3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EAX</span>
-<span id="L288" class="LineNr">288 </span>    31/xor                          3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EBX</span>
-<span id="L289" class="LineNr">289 </span><span class="Constant">$next-stream-line-equal?:loop</span>:
-<span id="L290" class="LineNr">290 </span>    <span class="subxComment"># if (currf &gt;= f-&gt;write) break</span>
-<span id="L291" class="LineNr">291 </span>    3b/compare                      0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare ECX with *ESI</span>
-<span id="L292" class="LineNr">292 </span>    7d/jump-if-greater-or-equal  $next-stream-line-equal?:break/disp8
-<span id="L293" class="LineNr">293 </span>    <span class="subxComment"># AL = *(f-&gt;data + f-&gt;read)</span>
-<span id="L294" class="LineNr">294 </span>    8a/copy-byte                    1/mod/*+disp8   4/rm32/sib    6/base/ESI  1/index/ECX  <span class="Normal"> . </span>          0/r32/AL    0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *(ESI+ECX+12) to AL</span>
-<span id="L295" class="LineNr">295 </span>    <span class="subxComment"># if (EAX == '\n') break</span>
-<span id="L296" class="LineNr">296 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xa/imm32/newline <span class="subxComment"># compare EAX</span>
-<span id="L297" class="LineNr">297 </span>    74/jump-if-equal  $next-stream-line-equal?:break/disp8
-<span id="L298" class="LineNr">298 </span>    <span class="subxComment"># if (currs &gt;= s-&gt;length) return false</span>
-<span id="L299" class="LineNr">299 </span>    3b/compare                      0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EDX with *EDI</span>
-<span id="L300" class="LineNr">300 </span>    7d/jump-if-greater-or-equal  $next-stream-line-equal?:false/disp8
-<span id="L301" class="LineNr">301 </span>    <span class="subxComment"># BL = *(s-&gt;data + currs)</span>
-<span id="L302" class="LineNr">302 </span>    8a/copy-byte                    1/mod/*+disp8   4/rm32/sib    7/base/EDI  2/index/EDX  <span class="Normal"> . </span>          3/r32/BL    4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *(EDI+EDX+4) to BL</span>
-<span id="L303" class="LineNr">303 </span>    <span class="subxComment"># if (EAX != EBX) return false</span>
-<span id="L304" class="LineNr">304 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX and EBX</span>
-<span id="L305" class="LineNr">305 </span>    75/jump-if-not-equal  $next-stream-line-equal?:false/disp8
-<span id="L306" class="LineNr">306 </span>    <span class="subxComment"># ++currf</span>
-<span id="L307" class="LineNr">307 </span>    41/increment-ECX
-<span id="L308" class="LineNr">308 </span>    <span class="subxComment"># ++currs</span>
-<span id="L309" class="LineNr">309 </span>    42/increment-EDX
-<span id="L310" class="LineNr">310 </span>    eb/jump $next-stream-line-equal?:loop/disp8
-<span id="L311" class="LineNr">311 </span><span class="Constant">$next-stream-line-equal?:break</span>:
-<span id="L312" class="LineNr">312 </span>    <span class="subxComment"># ++currf</span>
-<span id="L313" class="LineNr">313 </span>    41/increment-ECX
-<span id="L314" class="LineNr">314 </span>    <span class="subxComment"># if (currs &gt;= s-&gt;length) return true</span>
-<span id="L315" class="LineNr">315 </span>    3b/compare                      0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EDX with *EDI</span>
-<span id="L316" class="LineNr">316 </span>    7c/jump-if-lesser  $next-stream-line-equal?:false/disp8
-<span id="L317" class="LineNr">317 </span><span class="Constant">$next-stream-line-equal?:true</span>:
-<span id="L318" class="LineNr">318 </span>    b8/copy-to-EAX  1/imm32
-<span id="L319" class="LineNr">319 </span>    <span class="subxComment"># persist f-&gt;read on success</span>
-<span id="L320" class="LineNr">320 </span>    89/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy ECX to *(ESI+4)</span>
-<span id="L321" class="LineNr">321 </span>    eb/jump  $next-stream-line-equal?:end/disp8
-<span id="L322" class="LineNr">322 </span><span class="Constant">$next-stream-line-equal?:false</span>:
-<span id="L323" class="LineNr">323 </span>    b8/copy-to-EAX  0/imm32
-<span id="L324" class="LineNr">324 </span><span class="Constant">$next-stream-line-equal?:end</span>:
-<span id="L325" class="LineNr">325 </span>    <span class="subxS1Comment"># . restore registers</span>
-<span id="L326" class="LineNr">326 </span>    5f/pop-to-EDI
-<span id="L327" class="LineNr">327 </span>    5e/pop-to-ESI
-<span id="L328" class="LineNr">328 </span>    5a/pop-to-EDX
-<span id="L329" class="LineNr">329 </span>    59/pop-to-ECX
-<span id="L330" class="LineNr">330 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L331" class="LineNr">331 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L332" class="LineNr">332 </span>    5d/pop-to-EBP
-<span id="L333" class="LineNr">333 </span>    c3/return
-<span id="L334" class="LineNr">334 </span>
-<span id="L335" class="LineNr">335 </span><span class="subxTest">test-next-stream-line-equal-stops-at-newline</span>:
-<span id="L336" class="LineNr">336 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L337" class="LineNr">337 </span>    55/push-EBP
-<span id="L338" class="LineNr">338 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L339" class="LineNr">339 </span>    <span class="subxComment"># clear-stream(_test-stream)</span>
-<span id="L340" class="LineNr">340 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L341" class="LineNr">341 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L342" class="LineNr">342 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L343" class="LineNr">343 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L344" class="LineNr">344 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L345" class="LineNr">345 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L346" class="LineNr">346 </span>    <span class="subxComment"># write(_test-stream, &quot;Abc\ndef&quot;)</span>
-<span id="L347" class="LineNr">347 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;Abc&quot;)</span>
-<span id="L348" class="LineNr">348 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L349" class="LineNr">349 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
-<span id="L350" class="LineNr">350 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L351" class="LineNr">351 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L352" class="LineNr">352 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
-<span id="L353" class="LineNr">353 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L354" class="LineNr">354 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L355" class="LineNr">355 </span>    <span class="subxS1Comment"># . write(_test-stream, Newline)</span>
-<span id="L356" class="LineNr">356 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L357" class="LineNr">357 </span>    68/push  <span class="SpecialChar"><a href='051test.subx.html#L83'>Newline</a></span>/imm32
-<span id="L358" class="LineNr">358 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L359" class="LineNr">359 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L360" class="LineNr">360 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
-<span id="L361" class="LineNr">361 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L362" class="LineNr">362 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L363" class="LineNr">363 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;def&quot;)</span>
-<span id="L364" class="LineNr">364 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L365" class="LineNr">365 </span>    68/push  <span class="Constant">&quot;def&quot;</span>/imm32
-<span id="L366" class="LineNr">366 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L367" class="LineNr">367 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L368" class="LineNr">368 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
-<span id="L369" class="LineNr">369 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L370" class="LineNr">370 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L371" class="LineNr">371 </span>    <span class="subxComment"># EAX = next-stream-line-equal?(_test-stream, &quot;Abc&quot;)</span>
-<span id="L372" class="LineNr">372 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L373" class="LineNr">373 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
-<span id="L374" class="LineNr">374 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L375" class="LineNr">375 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L376" class="LineNr">376 </span>    e8/call  <a href='058stream-equal.subx.html#L233'>next-stream-line-equal?</a>/disp32
-<span id="L377" class="LineNr">377 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L378" class="LineNr">378 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L379" class="LineNr">379 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
-<span id="L380" class="LineNr">380 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L381" class="LineNr">381 </span>    68/push  <span class="Constant">&quot;F - test-next-stream-line-equal-stops-at-newline&quot;</span>/imm32
-<span id="L382" class="LineNr">382 </span>    68/push  1/imm32
-<span id="L383" class="LineNr">383 </span>    50/push-EAX
-<span id="L384" class="LineNr">384 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L385" class="LineNr">385 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L386" class="LineNr">386 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L387" class="LineNr">387 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L388" class="LineNr">388 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L389" class="LineNr">389 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L390" class="LineNr">390 </span>    5d/pop-to-EBP
-<span id="L391" class="LineNr">391 </span>    c3/return
-<span id="L392" class="LineNr">392 </span>
-<span id="L393" class="LineNr">393 </span><span class="subxTest">test-next-stream-line-equal-stops-at-newline-2</span>:
-<span id="L394" class="LineNr">394 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L395" class="LineNr">395 </span>    55/push-EBP
-<span id="L396" class="LineNr">396 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L397" class="LineNr">397 </span>    <span class="subxComment"># clear-stream(_test-stream)</span>
-<span id="L398" class="LineNr">398 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L399" class="LineNr">399 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L400" class="LineNr">400 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L401" class="LineNr">401 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L402" class="LineNr">402 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L403" class="LineNr">403 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L404" class="LineNr">404 </span>    <span class="subxComment"># write(_test-stream, &quot;Abc\ndef&quot;)</span>
-<span id="L405" class="LineNr">405 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;Abc&quot;)</span>
-<span id="L406" class="LineNr">406 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L407" class="LineNr">407 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
-<span id="L408" class="LineNr">408 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L409" class="LineNr">409 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L410" class="LineNr">410 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
-<span id="L411" class="LineNr">411 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L412" class="LineNr">412 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L413" class="LineNr">413 </span>    <span class="subxS1Comment"># . write(_test-stream, Newline)</span>
-<span id="L414" class="LineNr">414 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L415" class="LineNr">415 </span>    68/push  <span class="SpecialChar"><a href='051test.subx.html#L83'>Newline</a></span>/imm32
-<span id="L416" class="LineNr">416 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L417" class="LineNr">417 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L418" class="LineNr">418 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
-<span id="L419" class="LineNr">419 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L420" class="LineNr">420 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L421" class="LineNr">421 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;def&quot;)</span>
-<span id="L422" class="LineNr">422 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L423" class="LineNr">423 </span>    68/push  <span class="Constant">&quot;def&quot;</span>/imm32
-<span id="L424" class="LineNr">424 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L425" class="LineNr">425 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L426" class="LineNr">426 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
-<span id="L427" class="LineNr">427 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L428" class="LineNr">428 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L429" class="LineNr">429 </span>    <span class="subxComment"># EAX = next-stream-line-equal?(_test-stream, &quot;def&quot;)</span>
-<span id="L430" class="LineNr">430 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L431" class="LineNr">431 </span>    68/push  <span class="Constant">&quot;def&quot;</span>/imm32
-<span id="L432" class="LineNr">432 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L433" class="LineNr">433 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L434" class="LineNr">434 </span>    e8/call  <a href='058stream-equal.subx.html#L233'>next-stream-line-equal?</a>/disp32
-<span id="L435" class="LineNr">435 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L436" class="LineNr">436 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L437" class="LineNr">437 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
-<span id="L438" class="LineNr">438 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L439" class="LineNr">439 </span>    68/push  <span class="Constant">&quot;F - test-next-stream-line-equal-stops-at-newline-2&quot;</span>/imm32
-<span id="L440" class="LineNr">440 </span>    68/push  0/imm32
-<span id="L441" class="LineNr">441 </span>    50/push-EAX
-<span id="L442" class="LineNr">442 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L443" class="LineNr">443 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L444" class="LineNr">444 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L445" class="LineNr">445 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L446" class="LineNr">446 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L447" class="LineNr">447 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L448" class="LineNr">448 </span>    5d/pop-to-EBP
-<span id="L449" class="LineNr">449 </span>    c3/return
-<span id="L450" class="LineNr">450 </span>
-<span id="L451" class="LineNr">451 </span><span class="subxTest">test-next-stream-line-equal-skips-newline</span>:
-<span id="L452" class="LineNr">452 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L453" class="LineNr">453 </span>    55/push-EBP
-<span id="L454" class="LineNr">454 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L455" class="LineNr">455 </span>    <span class="subxComment"># clear-stream(_test-stream)</span>
-<span id="L456" class="LineNr">456 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L457" class="LineNr">457 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L458" class="LineNr">458 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L459" class="LineNr">459 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L460" class="LineNr">460 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L461" class="LineNr">461 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L462" class="LineNr">462 </span>    <span class="subxComment"># write(_test-stream, &quot;Abc\ndef\n&quot;)</span>
-<span id="L463" class="LineNr">463 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;Abc&quot;)</span>
-<span id="L464" class="LineNr">464 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L465" class="LineNr">465 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
-<span id="L466" class="LineNr">466 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L467" class="LineNr">467 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L468" class="LineNr">468 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
-<span id="L469" class="LineNr">469 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L470" class="LineNr">470 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L471" class="LineNr">471 </span>    <span class="subxS1Comment"># . write(_test-stream, Newline)</span>
-<span id="L472" class="LineNr">472 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L473" class="LineNr">473 </span>    68/push  <span class="SpecialChar"><a href='051test.subx.html#L83'>Newline</a></span>/imm32
-<span id="L474" class="LineNr">474 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L475" class="LineNr">475 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L476" class="LineNr">476 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
-<span id="L477" class="LineNr">477 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L478" class="LineNr">478 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L479" class="LineNr">479 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;def&quot;)</span>
-<span id="L480" class="LineNr">480 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L481" class="LineNr">481 </span>    68/push  <span class="Constant">&quot;def&quot;</span>/imm32
-<span id="L482" class="LineNr">482 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L483" class="LineNr">483 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L484" class="LineNr">484 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
-<span id="L485" class="LineNr">485 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L486" class="LineNr">486 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L487" class="LineNr">487 </span>    <span class="subxS1Comment"># . write(_test-stream, Newline)</span>
-<span id="L488" class="LineNr">488 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L489" class="LineNr">489 </span>    68/push  <span class="SpecialChar"><a href='051test.subx.html#L83'>Newline</a></span>/imm32
-<span id="L490" class="LineNr">490 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L491" class="LineNr">491 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L492" class="LineNr">492 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
-<span id="L493" class="LineNr">493 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L494" class="LineNr">494 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L495" class="LineNr">495 </span>    <span class="subxComment"># next-stream-line-equal?(_test-stream, &quot;Abc&quot;)</span>
-<span id="L496" class="LineNr">496 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L497" class="LineNr">497 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
-<span id="L498" class="LineNr">498 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L499" class="LineNr">499 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L500" class="LineNr">500 </span>    e8/call  <a href='058stream-equal.subx.html#L233'>next-stream-line-equal?</a>/disp32
-<span id="L501" class="LineNr">501 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L502" class="LineNr">502 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L503" class="LineNr">503 </span>    <span class="subxComment"># EAX = next-stream-line-equal?(_test-stream, &quot;def&quot;)</span>
-<span id="L504" class="LineNr">504 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L505" class="LineNr">505 </span>    68/push  <span class="Constant">&quot;def&quot;</span>/imm32
-<span id="L506" class="LineNr">506 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L507" class="LineNr">507 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L508" class="LineNr">508 </span>    e8/call  <a href='058stream-equal.subx.html#L233'>next-stream-line-equal?</a>/disp32
-<span id="L509" class="LineNr">509 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L510" class="LineNr">510 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L511" class="LineNr">511 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
-<span id="L512" class="LineNr">512 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L513" class="LineNr">513 </span>    68/push  <span class="Constant">&quot;F - test-next-stream-line-equal-skips-newline&quot;</span>/imm32
-<span id="L514" class="LineNr">514 </span>    68/push  1/imm32
-<span id="L515" class="LineNr">515 </span>    50/push-EAX
-<span id="L516" class="LineNr">516 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L517" class="LineNr">517 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L518" class="LineNr">518 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L519" class="LineNr">519 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L520" class="LineNr">520 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L521" class="LineNr">521 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L522" class="LineNr">522 </span>    5d/pop-to-EBP
-<span id="L523" class="LineNr">523 </span>    c3/return
-<span id="L524" class="LineNr">524 </span>
-<span id="L525" class="LineNr">525 </span><span class="subxTest">test-next-stream-line-equal-handles-final-line</span>:
-<span id="L526" class="LineNr">526 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L527" class="LineNr">527 </span>    55/push-EBP
-<span id="L528" class="LineNr">528 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L529" class="LineNr">529 </span>    <span class="subxComment"># clear-stream(_test-stream)</span>
-<span id="L530" class="LineNr">530 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L531" class="LineNr">531 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L532" class="LineNr">532 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L533" class="LineNr">533 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L534" class="LineNr">534 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L535" class="LineNr">535 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L536" class="LineNr">536 </span>    <span class="subxComment"># write(_test-stream, &quot;Abc\ndef&quot;)</span>
-<span id="L537" class="LineNr">537 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;Abc&quot;)</span>
-<span id="L538" class="LineNr">538 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L539" class="LineNr">539 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
-<span id="L540" class="LineNr">540 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L541" class="LineNr">541 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L542" class="LineNr">542 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
-<span id="L543" class="LineNr">543 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L544" class="LineNr">544 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L545" class="LineNr">545 </span>    <span class="subxS1Comment"># . write(_test-stream, Newline)</span>
-<span id="L546" class="LineNr">546 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L547" class="LineNr">547 </span>    68/push  <span class="SpecialChar"><a href='051test.subx.html#L83'>Newline</a></span>/imm32
-<span id="L548" class="LineNr">548 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L549" class="LineNr">549 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L550" class="LineNr">550 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
-<span id="L551" class="LineNr">551 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L552" class="LineNr">552 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L553" class="LineNr">553 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;def&quot;)</span>
-<span id="L554" class="LineNr">554 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L555" class="LineNr">555 </span>    68/push  <span class="Constant">&quot;def&quot;</span>/imm32
-<span id="L556" class="LineNr">556 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L557" class="LineNr">557 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L558" class="LineNr">558 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
-<span id="L559" class="LineNr">559 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L560" class="LineNr">560 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L561" class="LineNr">561 </span>    <span class="subxComment"># next-stream-line-equal?(_test-stream, &quot;Abc&quot;)</span>
-<span id="L562" class="LineNr">562 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L563" class="LineNr">563 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
-<span id="L564" class="LineNr">564 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L565" class="LineNr">565 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L566" class="LineNr">566 </span>    e8/call  <a href='058stream-equal.subx.html#L233'>next-stream-line-equal?</a>/disp32
-<span id="L567" class="LineNr">567 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L568" class="LineNr">568 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L569" class="LineNr">569 </span>    <span class="subxComment"># EAX = next-stream-line-equal?(_test-stream, &quot;def&quot;)</span>
-<span id="L570" class="LineNr">570 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L571" class="LineNr">571 </span>    68/push  <span class="Constant">&quot;def&quot;</span>/imm32
-<span id="L572" class="LineNr">572 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L573" class="LineNr">573 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L574" class="LineNr">574 </span>    e8/call  <a href='058stream-equal.subx.html#L233'>next-stream-line-equal?</a>/disp32
-<span id="L575" class="LineNr">575 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L576" class="LineNr">576 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L577" class="LineNr">577 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
-<span id="L578" class="LineNr">578 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L579" class="LineNr">579 </span>    68/push  <span class="Constant">&quot;F - test-next-stream-line-equal-skips-newline&quot;</span>/imm32
-<span id="L580" class="LineNr">580 </span>    68/push  1/imm32
-<span id="L581" class="LineNr">581 </span>    50/push-EAX
-<span id="L582" class="LineNr">582 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L583" class="LineNr">583 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L584" class="LineNr">584 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L585" class="LineNr">585 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L586" class="LineNr">586 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L587" class="LineNr">587 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L588" class="LineNr">588 </span>    5d/pop-to-EBP
-<span id="L589" class="LineNr">589 </span>    c3/return
-<span id="L590" class="LineNr">590 </span>
-<span id="L591" class="LineNr">591 </span><span class="subxTest">test-next-stream-line-equal-always-fails-after-Eof</span>:
-<span id="L592" class="LineNr">592 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L593" class="LineNr">593 </span>    55/push-EBP
-<span id="L594" class="LineNr">594 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L595" class="LineNr">595 </span>    <span class="subxComment"># clear-stream(_test-stream)</span>
-<span id="L596" class="LineNr">596 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L597" class="LineNr">597 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L598" class="LineNr">598 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L599" class="LineNr">599 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L600" class="LineNr">600 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L601" class="LineNr">601 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L602" class="LineNr">602 </span>    <span class="subxComment"># write nothing</span>
-<span id="L603" class="LineNr">603 </span>    <span class="subxComment"># EAX = next-stream-line-equal?(_test-stream, &quot;&quot;)</span>
-<span id="L604" class="LineNr">604 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L605" class="LineNr">605 </span>    68/push  <span class="Constant">&quot;&quot;</span>/imm32
-<span id="L606" class="LineNr">606 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L607" class="LineNr">607 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L608" class="LineNr">608 </span>    e8/call  <a href='058stream-equal.subx.html#L233'>next-stream-line-equal?</a>/disp32
-<span id="L609" class="LineNr">609 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L610" class="LineNr">610 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L611" class="LineNr">611 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
-<span id="L612" class="LineNr">612 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L613" class="LineNr">613 </span>    68/push  <span class="Constant">&quot;F - test-next-stream-line-equal-always-fails-after-Eof&quot;</span>/imm32
-<span id="L614" class="LineNr">614 </span>    68/push  1/imm32
-<span id="L615" class="LineNr">615 </span>    50/push-EAX
-<span id="L616" class="LineNr">616 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L617" class="LineNr">617 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L618" class="LineNr">618 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L619" class="LineNr">619 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L620" class="LineNr">620 </span>    <span class="subxComment"># EAX = next-stream-line-equal?(_test-stream, &quot;&quot;)</span>
-<span id="L621" class="LineNr">621 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L622" class="LineNr">622 </span>    68/push  <span class="Constant">&quot;&quot;</span>/imm32
-<span id="L623" class="LineNr">623 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L624" class="LineNr">624 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L625" class="LineNr">625 </span>    e8/call  <a href='058stream-equal.subx.html#L233'>next-stream-line-equal?</a>/disp32
-<span id="L626" class="LineNr">626 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L627" class="LineNr">627 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L628" class="LineNr">628 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
-<span id="L629" class="LineNr">629 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L630" class="LineNr">630 </span>    68/push  <span class="Constant">&quot;F - <a href='058stream-equal.subx.html#L591'>test-next-stream-line-equal-always-fails-after-Eof</a>/2&quot;</span>/imm32
-<span id="L631" class="LineNr">631 </span>    68/push  1/imm32
-<span id="L632" class="LineNr">632 </span>    50/push-EAX
-<span id="L633" class="LineNr">633 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L634" class="LineNr">634 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L635" class="LineNr">635 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L636" class="LineNr">636 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L637" class="LineNr">637 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L638" class="LineNr">638 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L639" class="LineNr">639 </span>    5d/pop-to-EBP
-<span id="L640" class="LineNr">640 </span>    c3/return
-<span id="L641" class="LineNr">641 </span>
-<span id="L642" class="LineNr">642 </span><span class="subxComment"># helper for later tests</span>
-<span id="L643" class="LineNr">643 </span><span class="subxFunction">check-next-stream-line-equal</span>:
-<span id="L644" class="LineNr">644 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L645" class="LineNr">645 </span>    55/push-EBP
-<span id="L646" class="LineNr">646 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L647" class="LineNr">647 </span>    <span class="subxS1Comment"># . save registers</span>
-<span id="L648" class="LineNr">648 </span>    50/push-EAX
-<span id="L649" class="LineNr">649 </span>    <span class="subxComment"># EAX = next-stream-line-equal?(f, s)</span>
-<span id="L650" class="LineNr">650 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L651" class="LineNr">651 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
-<span id="L652" class="LineNr">652 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
-<span id="L653" class="LineNr">653 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L654" class="LineNr">654 </span>    e8/call  <a href='058stream-equal.subx.html#L233'>next-stream-line-equal?</a>/disp32
-<span id="L655" class="LineNr">655 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L656" class="LineNr">656 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L657" class="LineNr">657 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
-<span id="L658" class="LineNr">658 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L659" class="LineNr">659 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
-<span id="L660" class="LineNr">660 </span>    68/push  1/imm32
-<span id="L661" class="LineNr">661 </span>    50/push-EAX
-<span id="L662" class="LineNr">662 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L663" class="LineNr">663 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L664" class="LineNr">664 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L665" class="LineNr">665 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L666" class="LineNr">666 </span>    <span class="subxS1Comment"># . restore registers</span>
-<span id="L667" class="LineNr">667 </span>    58/pop-to-EAX
-<span id="L668" class="LineNr">668 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L669" class="LineNr">669 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L670" class="LineNr">670 </span>    5d/pop-to-EBP
-<span id="L671" class="LineNr">671 </span>    c3/return
+<span id="L29" class="LineNr"> 29 </span>    <span class="subxComment"># max/EDX = f-&gt;data + f-&gt;write</span>
+<span id="L30" class="LineNr"> 30 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  0/index/EAX  <span class="Normal"> . </span>          2/r32/EDX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy ESI+EAX+12 to EDX</span>
+<span id="L31" class="LineNr"> 31 </span>    <span class="subxComment"># currf/ESI = f-&gt;data</span>
+<span id="L32" class="LineNr"> 32 </span>    81          0/subop/add         3/mod/direct    6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESI</span>
+<span id="L33" class="LineNr"> 33 </span>    <span class="subxComment"># EDI = s</span>
+<span id="L34" class="LineNr"> 34 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          7/r32/EDI   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDI</span>
+<span id="L35" class="LineNr"> 35 </span>    <span class="subxComment"># if (f-&gt;write != s-&gt;length) return false</span>
+<span id="L36" class="LineNr"> 36 </span>    39/compare                      0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare *EDI and EAX</span>
+<span id="L37" class="LineNr"> 37 </span>    75/jump-if-not-equal  $stream-data-equal?:false/disp8
+<span id="L38" class="LineNr"> 38 </span>    <span class="subxComment"># currs/EDI = s-&gt;data</span>
+<span id="L39" class="LineNr"> 39 </span>    81          0/subop/add         3/mod/direct    7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to EDI</span>
+<span id="L40" class="LineNr"> 40 </span>    <span class="subxComment"># EAX = ECX = 0</span>
+<span id="L41" class="LineNr"> 41 </span>    31/xor                          3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EAX</span>
+<span id="L42" class="LineNr"> 42 </span>    31/xor                          3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear ECX</span>
+<span id="L43" class="LineNr"> 43 </span><span class="Constant">$stream-data-equal?:loop</span>:
+<span id="L44" class="LineNr"> 44 </span>    <span class="subxComment"># if (curr &gt;= max) return true</span>
+<span id="L45" class="LineNr"> 45 </span>    39/compare                      3/mod/direct    6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare ESI with EDX</span>
+<span id="L46" class="LineNr"> 46 </span>    7d/jump-if-greater-or-equal  $stream-data-equal?:true/disp8
+<span id="L47" class="LineNr"> 47 </span>    <span class="subxComment"># AL = *currs</span>
+<span id="L48" class="LineNr"> 48 </span>    8a/copy-byte                    0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/AL   <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *ESI to AL</span>
+<span id="L49" class="LineNr"> 49 </span>    <span class="subxComment"># CL = *curr</span>
+<span id="L50" class="LineNr"> 50 </span>    8a/copy-byte                    0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/CL   <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *EDI to CL</span>
+<span id="L51" class="LineNr"> 51 </span>    <span class="subxComment"># if (EAX != ECX) return false</span>
+<span id="L52" class="LineNr"> 52 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX and ECX</span>
+<span id="L53" class="LineNr"> 53 </span>    75/jump-if-not-equal  $stream-data-equal?:false/disp8
+<span id="L54" class="LineNr"> 54 </span>    <span class="subxComment"># ++f</span>
+<span id="L55" class="LineNr"> 55 </span>    46/increment-ESI
+<span id="L56" class="LineNr"> 56 </span>    <span class="subxComment"># ++curr</span>
+<span id="L57" class="LineNr"> 57 </span>    47/increment-EDI
+<span id="L58" class="LineNr"> 58 </span>    eb/jump $stream-data-equal?:loop/disp8
+<span id="L59" class="LineNr"> 59 </span><span class="Constant">$stream-data-equal?:false</span>:
+<span id="L60" class="LineNr"> 60 </span>    b8/copy-to-EAX  0/imm32
+<span id="L61" class="LineNr"> 61 </span>    eb/jump  $stream-data-equal?:end/disp8
+<span id="L62" class="LineNr"> 62 </span><span class="Constant">$stream-data-equal?:true</span>:
+<span id="L63" class="LineNr"> 63 </span>    b8/copy-to-EAX  1/imm32
+<span id="L64" class="LineNr"> 64 </span><span class="Constant">$stream-data-equal?:end</span>:
+<span id="L65" class="LineNr"> 65 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L66" class="LineNr"> 66 </span>    5f/pop-to-EDI
+<span id="L67" class="LineNr"> 67 </span>    5e/pop-to-ESI
+<span id="L68" class="LineNr"> 68 </span>    5a/pop-to-EDX
+<span id="L69" class="LineNr"> 69 </span>    59/pop-to-ECX
+<span id="L70" class="LineNr"> 70 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L71" class="LineNr"> 71 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L72" class="LineNr"> 72 </span>    5d/pop-to-EBP
+<span id="L73" class="LineNr"> 73 </span>    c3/return
+<span id="L74" class="LineNr"> 74 </span>
+<span id="L75" class="LineNr"> 75 </span><span class="subxTest">test-stream-data-equal</span>:
+<span id="L76" class="LineNr"> 76 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L77" class="LineNr"> 77 </span>    55/push-EBP
+<span id="L78" class="LineNr"> 78 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L79" class="LineNr"> 79 </span>    <span class="subxComment"># clear-stream(_test-stream)</span>
+<span id="L80" class="LineNr"> 80 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L81" class="LineNr"> 81 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L82" class="LineNr"> 82 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L83" class="LineNr"> 83 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L84" class="LineNr"> 84 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L85" class="LineNr"> 85 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L86" class="LineNr"> 86 </span>    <span class="subxComment"># write(_test-stream, &quot;Abc&quot;)</span>
+<span id="L87" class="LineNr"> 87 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L88" class="LineNr"> 88 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
+<span id="L89" class="LineNr"> 89 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L90" class="LineNr"> 90 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L91" class="LineNr"> 91 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
+<span id="L92" class="LineNr"> 92 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L93" class="LineNr"> 93 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L94" class="LineNr"> 94 </span>    <span class="subxComment"># EAX = stream-data-equal?(_test-stream, &quot;Abc&quot;)</span>
+<span id="L95" class="LineNr"> 95 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L96" class="LineNr"> 96 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
+<span id="L97" class="LineNr"> 97 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L98" class="LineNr"> 98 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L99" class="LineNr"> 99 </span>    e8/call  <a href='058stream-equal.subx.html#L16'>stream-data-equal?</a>/disp32
+<span id="L100" class="LineNr">100 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L101" class="LineNr">101 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L102" class="LineNr">102 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
+<span id="L103" class="LineNr">103 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L104" class="LineNr">104 </span>    68/push  <span class="Constant">&quot;F - test-stream-data-equal&quot;</span>/imm32
+<span id="L105" class="LineNr">105 </span>    68/push  1/imm32
+<span id="L106" class="LineNr">106 </span>    50/push-EAX
+<span id="L107" class="LineNr">107 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L108" class="LineNr">108 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L109" class="LineNr">109 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L110" class="LineNr">110 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L111" class="LineNr">111 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L112" class="LineNr">112 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L113" class="LineNr">113 </span>    5d/pop-to-EBP
+<span id="L114" class="LineNr">114 </span>    c3/return
+<span id="L115" class="LineNr">115 </span>
+<span id="L116" class="LineNr">116 </span><span class="subxTest">test-stream-data-equal-2</span>:
+<span id="L117" class="LineNr">117 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L118" class="LineNr">118 </span>    55/push-EBP
+<span id="L119" class="LineNr">119 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L120" class="LineNr">120 </span>    <span class="subxComment"># clear-stream(_test-stream)</span>
+<span id="L121" class="LineNr">121 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L122" class="LineNr">122 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L123" class="LineNr">123 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L124" class="LineNr">124 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L125" class="LineNr">125 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L126" class="LineNr">126 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L127" class="LineNr">127 </span>    <span class="subxComment"># write(_test-stream, &quot;Abc&quot;)</span>
+<span id="L128" class="LineNr">128 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L129" class="LineNr">129 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
+<span id="L130" class="LineNr">130 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L131" class="LineNr">131 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L132" class="LineNr">132 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
+<span id="L133" class="LineNr">133 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L134" class="LineNr">134 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L135" class="LineNr">135 </span>    <span class="subxComment"># EAX = stream-data-equal?(_test-stream, &quot;Abd&quot;)</span>
+<span id="L136" class="LineNr">136 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L137" class="LineNr">137 </span>    68/push  <span class="Constant">&quot;Abd&quot;</span>/imm32
+<span id="L138" class="LineNr">138 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L139" class="LineNr">139 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L140" class="LineNr">140 </span>    e8/call  <a href='058stream-equal.subx.html#L16'>stream-data-equal?</a>/disp32
+<span id="L141" class="LineNr">141 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L142" class="LineNr">142 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L143" class="LineNr">143 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
+<span id="L144" class="LineNr">144 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L145" class="LineNr">145 </span>    68/push  <span class="Constant">&quot;F - test-stream-data-equal-2&quot;</span>/imm32
+<span id="L146" class="LineNr">146 </span>    68/push  0/imm32
+<span id="L147" class="LineNr">147 </span>    50/push-EAX
+<span id="L148" class="LineNr">148 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L149" class="LineNr">149 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L150" class="LineNr">150 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L151" class="LineNr">151 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L152" class="LineNr">152 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L153" class="LineNr">153 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L154" class="LineNr">154 </span>    5d/pop-to-EBP
+<span id="L155" class="LineNr">155 </span>    c3/return
+<span id="L156" class="LineNr">156 </span>
+<span id="L157" class="LineNr">157 </span><span class="subxTest">test-stream-data-equal-length-check</span>:
+<span id="L158" class="LineNr">158 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L159" class="LineNr">159 </span>    55/push-EBP
+<span id="L160" class="LineNr">160 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L161" class="LineNr">161 </span>    <span class="subxComment"># clear-stream(_test-stream)</span>
+<span id="L162" class="LineNr">162 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L163" class="LineNr">163 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L164" class="LineNr">164 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L165" class="LineNr">165 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L166" class="LineNr">166 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L167" class="LineNr">167 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L168" class="LineNr">168 </span>    <span class="subxComment"># write(_test-stream, &quot;Abc&quot;)</span>
+<span id="L169" class="LineNr">169 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L170" class="LineNr">170 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
+<span id="L171" class="LineNr">171 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L172" class="LineNr">172 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L173" class="LineNr">173 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
+<span id="L174" class="LineNr">174 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L175" class="LineNr">175 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L176" class="LineNr">176 </span>    <span class="subxComment"># EAX = stream-data-equal?(_test-stream, &quot;Abcd&quot;)</span>
+<span id="L177" class="LineNr">177 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L178" class="LineNr">178 </span>    68/push  <span class="Constant">&quot;Abcd&quot;</span>/imm32
+<span id="L179" class="LineNr">179 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L180" class="LineNr">180 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L181" class="LineNr">181 </span>    e8/call  <a href='058stream-equal.subx.html#L16'>stream-data-equal?</a>/disp32
+<span id="L182" class="LineNr">182 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L183" class="LineNr">183 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L184" class="LineNr">184 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
+<span id="L185" class="LineNr">185 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L186" class="LineNr">186 </span>    68/push  <span class="Constant">&quot;F - test-stream-data-equal-length-check&quot;</span>/imm32
+<span id="L187" class="LineNr">187 </span>    68/push  0/imm32
+<span id="L188" class="LineNr">188 </span>    50/push-EAX
+<span id="L189" class="LineNr">189 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L190" class="LineNr">190 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L191" class="LineNr">191 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L192" class="LineNr">192 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L193" class="LineNr">193 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L194" class="LineNr">194 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L195" class="LineNr">195 </span>    5d/pop-to-EBP
+<span id="L196" class="LineNr">196 </span>    c3/return
+<span id="L197" class="LineNr">197 </span>
+<span id="L198" class="LineNr">198 </span><span class="subxComment"># helper for later tests</span>
+<span id="L199" class="LineNr">199 </span><span class="subxFunction">check-stream-equal</span>:  <span class="subxComment"># f : (address stream), s : (address string), msg : (address string)</span>
+<span id="L200" class="LineNr">200 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L201" class="LineNr">201 </span>    55/push-EBP
+<span id="L202" class="LineNr">202 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L203" class="LineNr">203 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L204" class="LineNr">204 </span>    50/push-EAX
+<span id="L205" class="LineNr">205 </span>    <span class="subxComment"># EAX = stream-data-equal?(f, s)</span>
+<span id="L206" class="LineNr">206 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L207" class="LineNr">207 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L208" class="LineNr">208 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L209" class="LineNr">209 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L210" class="LineNr">210 </span>    e8/call  <a href='058stream-equal.subx.html#L16'>stream-data-equal?</a>/disp32
+<span id="L211" class="LineNr">211 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L212" class="LineNr">212 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L213" class="LineNr">213 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
+<span id="L214" class="LineNr">214 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L215" class="LineNr">215 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
+<span id="L216" class="LineNr">216 </span>    68/push  1/imm32
+<span id="L217" class="LineNr">217 </span>    50/push-EAX
+<span id="L218" class="LineNr">218 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L219" class="LineNr">219 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L220" class="LineNr">220 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L221" class="LineNr">221 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L222" class="LineNr">222 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L223" class="LineNr">223 </span>    58/pop-to-EAX
+<span id="L224" class="LineNr">224 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L225" class="LineNr">225 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L226" class="LineNr">226 </span>    5d/pop-to-EBP
+<span id="L227" class="LineNr">227 </span>    c3/return
+<span id="L228" class="LineNr">228 </span>
+<span id="L229" class="LineNr">229 </span><span class="subxComment"># scan the next line until newline starting from f-&gt;read and compare it with</span>
+<span id="L230" class="LineNr">230 </span><span class="subxComment"># 's' (ignoring the trailing newline)</span>
+<span id="L231" class="LineNr">231 </span><span class="subxComment"># on success, set f-&gt;read to after the next newline</span>
+<span id="L232" class="LineNr">232 </span><span class="subxComment"># on failure, leave f-&gt;read unmodified</span>
+<span id="L233" class="LineNr">233 </span><span class="subxComment"># this function is usually used only in tests, so we repeatedly write f-&gt;read</span>
+<span id="L234" class="LineNr">234 </span><span class="subxFunction">next-stream-line-equal?</span>:  <span class="subxComment"># f : (address stream), s : (address string) -&gt; EAX : boolean</span>
+<span id="L235" class="LineNr">235 </span>    <span class="subxComment"># pseudocode:</span>
+<span id="L236" class="LineNr">236 </span>    <span class="subxComment">#   currf = f-&gt;read  # bound: f-&gt;write</span>
+<span id="L237" class="LineNr">237 </span>    <span class="subxComment">#   currs = 0  # bound : s-&gt;length</span>
+<span id="L238" class="LineNr">238 </span>    <span class="subxComment">#   while true</span>
+<span id="L239" class="LineNr">239 </span>    <span class="subxComment">#     if currf &gt;= f-&gt;write</span>
+<span id="L240" class="LineNr">240 </span>    <span class="subxComment">#       return currs &gt;= s-&gt;length</span>
+<span id="L241" class="LineNr">241 </span>    <span class="subxComment">#     if f[currf] == '\n'</span>
+<span id="L242" class="LineNr">242 </span>    <span class="subxComment">#       ++currf</span>
+<span id="L243" class="LineNr">243 </span>    <span class="subxComment">#       return currs &gt;= s-&gt;length</span>
+<span id="L244" class="LineNr">244 </span>    <span class="subxComment">#     if (currs &gt;= s-&gt;length) return false  # the current line of f still has data to match</span>
+<span id="L245" class="LineNr">245 </span>    <span class="subxComment">#     if (f[currf] != s[currs]) return false</span>
+<span id="L246" class="LineNr">246 </span>    <span class="subxComment">#     ++currf</span>
+<span id="L247" class="LineNr">247 </span>    <span class="subxComment">#     ++currs</span>
+<span id="L248" class="LineNr">248 </span>    <span class="subxComment">#</span>
+<span id="L249" class="LineNr">249 </span>    <span class="subxComment"># collapsing the two branches that can return true:</span>
+<span id="L250" class="LineNr">250 </span>    <span class="subxComment">#   currf = f-&gt;read  # bound: f-&gt;write</span>
+<span id="L251" class="LineNr">251 </span>    <span class="subxComment">#   currs = 0  # bound : s-&gt;length</span>
+<span id="L252" class="LineNr">252 </span>    <span class="subxComment">#   while true</span>
+<span id="L253" class="LineNr">253 </span>    <span class="subxComment">#     if (currf &gt;= f-&gt;write) break</span>
+<span id="L254" class="LineNr">254 </span>    <span class="subxComment">#     if (f[currf] == '\n') break</span>
+<span id="L255" class="LineNr">255 </span>    <span class="subxComment">#     if (currs &gt;= s-&gt;length) return false  # the current line of f still has data to match</span>
+<span id="L256" class="LineNr">256 </span>    <span class="subxComment">#     if (f[currf] != s[currs]) return false</span>
+<span id="L257" class="LineNr">257 </span>    <span class="subxComment">#     ++currf</span>
+<span id="L258" class="LineNr">258 </span>    <span class="subxComment">#     ++currs</span>
+<span id="L259" class="LineNr">259 </span>    <span class="subxComment">#   ++currf  # skip '\n'</span>
+<span id="L260" class="LineNr">260 </span>    <span class="subxComment">#   return currs &gt;= s-&gt;length</span>
+<span id="L261" class="LineNr">261 </span>    <span class="subxComment"># Here the final `++currf` is sometimes unnecessary (if we're already at the end of the stream)</span>
+<span id="L262" class="LineNr">262 </span>    <span class="subxComment">#</span>
+<span id="L263" class="LineNr">263 </span>    <span class="subxComment"># registers:</span>
+<span id="L264" class="LineNr">264 </span>    <span class="subxComment">#   f: ESI</span>
+<span id="L265" class="LineNr">265 </span>    <span class="subxComment">#   s: EDI</span>
+<span id="L266" class="LineNr">266 </span>    <span class="subxComment">#   currf: ECX</span>
+<span id="L267" class="LineNr">267 </span>    <span class="subxComment">#   currs: EDX</span>
+<span id="L268" class="LineNr">268 </span>    <span class="subxComment">#   f[currf]: EAX</span>
+<span id="L269" class="LineNr">269 </span>    <span class="subxComment">#   s[currs]: EBX</span>
+<span id="L270" class="LineNr">270 </span>    <span class="subxComment">#</span>
+<span id="L271" class="LineNr">271 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L272" class="LineNr">272 </span>    55/push-EBP
+<span id="L273" class="LineNr">273 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L274" class="LineNr">274 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L275" class="LineNr">275 </span>    51/push-ECX
+<span id="L276" class="LineNr">276 </span>    52/push-EDX
+<span id="L277" class="LineNr">277 </span>    56/push-ESI
+<span id="L278" class="LineNr">278 </span>    57/push-EDI
+<span id="L279" class="LineNr">279 </span>    <span class="subxComment"># ESI = f</span>
+<span id="L280" class="LineNr">280 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
+<span id="L281" class="LineNr">281 </span>    <span class="subxComment"># currf/ECX = f-&gt;read</span>
+<span id="L282" class="LineNr">282 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESI+4) to ECX</span>
+<span id="L283" class="LineNr">283 </span>    <span class="subxComment"># EDI = s</span>
+<span id="L284" class="LineNr">284 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          7/r32/EDI   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDI</span>
+<span id="L285" class="LineNr">285 </span>    <span class="subxComment"># currs/EDX = 0</span>
+<span id="L286" class="LineNr">286 </span>    31/xor                          3/mod/direct    2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EDX</span>
+<span id="L287" class="LineNr">287 </span>    <span class="subxComment"># EAX = EBX = 0</span>
+<span id="L288" class="LineNr">288 </span>    31/xor                          3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EAX</span>
+<span id="L289" class="LineNr">289 </span>    31/xor                          3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EBX</span>
+<span id="L290" class="LineNr">290 </span><span class="Constant">$next-stream-line-equal?:loop</span>:
+<span id="L291" class="LineNr">291 </span>    <span class="subxComment"># if (currf &gt;= f-&gt;write) break</span>
+<span id="L292" class="LineNr">292 </span>    3b/compare                      0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare ECX with *ESI</span>
+<span id="L293" class="LineNr">293 </span>    7d/jump-if-greater-or-equal  $next-stream-line-equal?:break/disp8
+<span id="L294" class="LineNr">294 </span>    <span class="subxComment"># AL = *(f-&gt;data + f-&gt;read)</span>
+<span id="L295" class="LineNr">295 </span>    8a/copy-byte                    1/mod/*+disp8   4/rm32/sib    6/base/ESI  1/index/ECX  <span class="Normal"> . </span>          0/r32/AL    0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *(ESI+ECX+12) to AL</span>
+<span id="L296" class="LineNr">296 </span>    <span class="subxComment"># if (EAX == '\n') break</span>
+<span id="L297" class="LineNr">297 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xa/imm32/newline <span class="subxComment"># compare EAX</span>
+<span id="L298" class="LineNr">298 </span>    74/jump-if-equal  $next-stream-line-equal?:break/disp8
+<span id="L299" class="LineNr">299 </span>    <span class="subxComment"># if (currs &gt;= s-&gt;length) return false</span>
+<span id="L300" class="LineNr">300 </span>    3b/compare                      0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EDX with *EDI</span>
+<span id="L301" class="LineNr">301 </span>    7d/jump-if-greater-or-equal  $next-stream-line-equal?:false/disp8
+<span id="L302" class="LineNr">302 </span>    <span class="subxComment"># BL = *(s-&gt;data + currs)</span>
+<span id="L303" class="LineNr">303 </span>    8a/copy-byte                    1/mod/*+disp8   4/rm32/sib    7/base/EDI  2/index/EDX  <span class="Normal"> . </span>          3/r32/BL    4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *(EDI+EDX+4) to BL</span>
+<span id="L304" class="LineNr">304 </span>    <span class="subxComment"># if (EAX != EBX) return false</span>
+<span id="L305" class="LineNr">305 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX and EBX</span>
+<span id="L306" class="LineNr">306 </span>    75/jump-if-not-equal  $next-stream-line-equal?:false/disp8
+<span id="L307" class="LineNr">307 </span>    <span class="subxComment"># ++currf</span>
+<span id="L308" class="LineNr">308 </span>    41/increment-ECX
+<span id="L309" class="LineNr">309 </span>    <span class="subxComment"># ++currs</span>
+<span id="L310" class="LineNr">310 </span>    42/increment-EDX
+<span id="L311" class="LineNr">311 </span>    eb/jump $next-stream-line-equal?:loop/disp8
+<span id="L312" class="LineNr">312 </span><span class="Constant">$next-stream-line-equal?:break</span>:
+<span id="L313" class="LineNr">313 </span>    <span class="subxComment"># ++currf</span>
+<span id="L314" class="LineNr">314 </span>    41/increment-ECX
+<span id="L315" class="LineNr">315 </span>    <span class="subxComment"># if (currs &gt;= s-&gt;length) return true</span>
+<span id="L316" class="LineNr">316 </span>    3b/compare                      0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EDX with *EDI</span>
+<span id="L317" class="LineNr">317 </span>    7c/jump-if-lesser  $next-stream-line-equal?:false/disp8
+<span id="L318" class="LineNr">318 </span><span class="Constant">$next-stream-line-equal?:true</span>:
+<span id="L319" class="LineNr">319 </span>    b8/copy-to-EAX  1/imm32
+<span id="L320" class="LineNr">320 </span>    <span class="subxComment"># persist f-&gt;read on success</span>
+<span id="L321" class="LineNr">321 </span>    89/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy ECX to *(ESI+4)</span>
+<span id="L322" class="LineNr">322 </span>    eb/jump  $next-stream-line-equal?:end/disp8
+<span id="L323" class="LineNr">323 </span><span class="Constant">$next-stream-line-equal?:false</span>:
+<span id="L324" class="LineNr">324 </span>    b8/copy-to-EAX  0/imm32
+<span id="L325" class="LineNr">325 </span><span class="Constant">$next-stream-line-equal?:end</span>:
+<span id="L326" class="LineNr">326 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L327" class="LineNr">327 </span>    5f/pop-to-EDI
+<span id="L328" class="LineNr">328 </span>    5e/pop-to-ESI
+<span id="L329" class="LineNr">329 </span>    5a/pop-to-EDX
+<span id="L330" class="LineNr">330 </span>    59/pop-to-ECX
+<span id="L331" class="LineNr">331 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L332" class="LineNr">332 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L333" class="LineNr">333 </span>    5d/pop-to-EBP
+<span id="L334" class="LineNr">334 </span>    c3/return
+<span id="L335" class="LineNr">335 </span>
+<span id="L336" class="LineNr">336 </span><span class="subxTest">test-next-stream-line-equal-stops-at-newline</span>:
+<span id="L337" class="LineNr">337 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L338" class="LineNr">338 </span>    55/push-EBP
+<span id="L339" class="LineNr">339 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L340" class="LineNr">340 </span>    <span class="subxComment"># clear-stream(_test-stream)</span>
+<span id="L341" class="LineNr">341 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L342" class="LineNr">342 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L343" class="LineNr">343 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L344" class="LineNr">344 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L345" class="LineNr">345 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L346" class="LineNr">346 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L347" class="LineNr">347 </span>    <span class="subxComment"># write(_test-stream, &quot;Abc\ndef&quot;)</span>
+<span id="L348" class="LineNr">348 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;Abc&quot;)</span>
+<span id="L349" class="LineNr">349 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L350" class="LineNr">350 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
+<span id="L351" class="LineNr">351 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L352" class="LineNr">352 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L353" class="LineNr">353 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
+<span id="L354" class="LineNr">354 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L355" class="LineNr">355 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L356" class="LineNr">356 </span>    <span class="subxS1Comment"># . write(_test-stream, Newline)</span>
+<span id="L357" class="LineNr">357 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L358" class="LineNr">358 </span>    68/push  <span class="SpecialChar"><a href='051test.subx.html#L83'>Newline</a></span>/imm32
+<span id="L359" class="LineNr">359 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L360" class="LineNr">360 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L361" class="LineNr">361 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
+<span id="L362" class="LineNr">362 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L363" class="LineNr">363 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L364" class="LineNr">364 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;def&quot;)</span>
+<span id="L365" class="LineNr">365 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L366" class="LineNr">366 </span>    68/push  <span class="Constant">&quot;def&quot;</span>/imm32
+<span id="L367" class="LineNr">367 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L368" class="LineNr">368 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L369" class="LineNr">369 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
+<span id="L370" class="LineNr">370 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L371" class="LineNr">371 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L372" class="LineNr">372 </span>    <span class="subxComment"># EAX = next-stream-line-equal?(_test-stream, &quot;Abc&quot;)</span>
+<span id="L373" class="LineNr">373 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L374" class="LineNr">374 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
+<span id="L375" class="LineNr">375 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L376" class="LineNr">376 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L377" class="LineNr">377 </span>    e8/call  <a href='058stream-equal.subx.html#L234'>next-stream-line-equal?</a>/disp32
+<span id="L378" class="LineNr">378 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L379" class="LineNr">379 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L380" class="LineNr">380 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
+<span id="L381" class="LineNr">381 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L382" class="LineNr">382 </span>    68/push  <span class="Constant">&quot;F - test-next-stream-line-equal-stops-at-newline&quot;</span>/imm32
+<span id="L383" class="LineNr">383 </span>    68/push  1/imm32
+<span id="L384" class="LineNr">384 </span>    50/push-EAX
+<span id="L385" class="LineNr">385 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L386" class="LineNr">386 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L387" class="LineNr">387 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L388" class="LineNr">388 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L389" class="LineNr">389 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L390" class="LineNr">390 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L391" class="LineNr">391 </span>    5d/pop-to-EBP
+<span id="L392" class="LineNr">392 </span>    c3/return
+<span id="L393" class="LineNr">393 </span>
+<span id="L394" class="LineNr">394 </span><span class="subxTest">test-next-stream-line-equal-stops-at-newline-2</span>:
+<span id="L395" class="LineNr">395 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L396" class="LineNr">396 </span>    55/push-EBP
+<span id="L397" class="LineNr">397 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L398" class="LineNr">398 </span>    <span class="subxComment"># clear-stream(_test-stream)</span>
+<span id="L399" class="LineNr">399 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L400" class="LineNr">400 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L401" class="LineNr">401 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L402" class="LineNr">402 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L403" class="LineNr">403 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L404" class="LineNr">404 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L405" class="LineNr">405 </span>    <span class="subxComment"># write(_test-stream, &quot;Abc\ndef&quot;)</span>
+<span id="L406" class="LineNr">406 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;Abc&quot;)</span>
+<span id="L407" class="LineNr">407 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L408" class="LineNr">408 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
+<span id="L409" class="LineNr">409 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L410" class="LineNr">410 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L411" class="LineNr">411 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
+<span id="L412" class="LineNr">412 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L413" class="LineNr">413 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L414" class="LineNr">414 </span>    <span class="subxS1Comment"># . write(_test-stream, Newline)</span>
+<span id="L415" class="LineNr">415 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L416" class="LineNr">416 </span>    68/push  <span class="SpecialChar"><a href='051test.subx.html#L83'>Newline</a></span>/imm32
+<span id="L417" class="LineNr">417 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L418" class="LineNr">418 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L419" class="LineNr">419 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
+<span id="L420" class="LineNr">420 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L421" class="LineNr">421 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L422" class="LineNr">422 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;def&quot;)</span>
+<span id="L423" class="LineNr">423 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L424" class="LineNr">424 </span>    68/push  <span class="Constant">&quot;def&quot;</span>/imm32
+<span id="L425" class="LineNr">425 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L426" class="LineNr">426 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L427" class="LineNr">427 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
+<span id="L428" class="LineNr">428 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L429" class="LineNr">429 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L430" class="LineNr">430 </span>    <span class="subxComment"># EAX = next-stream-line-equal?(_test-stream, &quot;def&quot;)</span>
+<span id="L431" class="LineNr">431 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L432" class="LineNr">432 </span>    68/push  <span class="Constant">&quot;def&quot;</span>/imm32
+<span id="L433" class="LineNr">433 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L434" class="LineNr">434 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L435" class="LineNr">435 </span>    e8/call  <a href='058stream-equal.subx.html#L234'>next-stream-line-equal?</a>/disp32
+<span id="L436" class="LineNr">436 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L437" class="LineNr">437 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L438" class="LineNr">438 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
+<span id="L439" class="LineNr">439 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L440" class="LineNr">440 </span>    68/push  <span class="Constant">&quot;F - test-next-stream-line-equal-stops-at-newline-2&quot;</span>/imm32
+<span id="L441" class="LineNr">441 </span>    68/push  0/imm32
+<span id="L442" class="LineNr">442 </span>    50/push-EAX
+<span id="L443" class="LineNr">443 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L444" class="LineNr">444 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L445" class="LineNr">445 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L446" class="LineNr">446 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L447" class="LineNr">447 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L448" class="LineNr">448 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L449" class="LineNr">449 </span>    5d/pop-to-EBP
+<span id="L450" class="LineNr">450 </span>    c3/return
+<span id="L451" class="LineNr">451 </span>
+<span id="L452" class="LineNr">452 </span><span class="subxTest">test-next-stream-line-equal-skips-newline</span>:
+<span id="L453" class="LineNr">453 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L454" class="LineNr">454 </span>    55/push-EBP
+<span id="L455" class="LineNr">455 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L456" class="LineNr">456 </span>    <span class="subxComment"># clear-stream(_test-stream)</span>
+<span id="L457" class="LineNr">457 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L458" class="LineNr">458 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L459" class="LineNr">459 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L460" class="LineNr">460 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L461" class="LineNr">461 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L462" class="LineNr">462 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L463" class="LineNr">463 </span>    <span class="subxComment"># write(_test-stream, &quot;Abc\ndef\n&quot;)</span>
+<span id="L464" class="LineNr">464 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;Abc&quot;)</span>
+<span id="L465" class="LineNr">465 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L466" class="LineNr">466 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
+<span id="L467" class="LineNr">467 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L468" class="LineNr">468 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L469" class="LineNr">469 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
+<span id="L470" class="LineNr">470 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L471" class="LineNr">471 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L472" class="LineNr">472 </span>    <span class="subxS1Comment"># . write(_test-stream, Newline)</span>
+<span id="L473" class="LineNr">473 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L474" class="LineNr">474 </span>    68/push  <span class="SpecialChar"><a href='051test.subx.html#L83'>Newline</a></span>/imm32
+<span id="L475" class="LineNr">475 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L476" class="LineNr">476 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L477" class="LineNr">477 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
+<span id="L478" class="LineNr">478 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L479" class="LineNr">479 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L480" class="LineNr">480 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;def&quot;)</span>
+<span id="L481" class="LineNr">481 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L482" class="LineNr">482 </span>    68/push  <span class="Constant">&quot;def&quot;</span>/imm32
+<span id="L483" class="LineNr">483 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L484" class="LineNr">484 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L485" class="LineNr">485 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
+<span id="L486" class="LineNr">486 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L487" class="LineNr">487 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L488" class="LineNr">488 </span>    <span class="subxS1Comment"># . write(_test-stream, Newline)</span>
+<span id="L489" class="LineNr">489 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L490" class="LineNr">490 </span>    68/push  <span class="SpecialChar"><a href='051test.subx.html#L83'>Newline</a></span>/imm32
+<span id="L491" class="LineNr">491 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L492" class="LineNr">492 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L493" class="LineNr">493 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
+<span id="L494" class="LineNr">494 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L495" class="LineNr">495 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L496" class="LineNr">496 </span>    <span class="subxComment"># next-stream-line-equal?(_test-stream, &quot;Abc&quot;)</span>
+<span id="L497" class="LineNr">497 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L498" class="LineNr">498 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
+<span id="L499" class="LineNr">499 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L500" class="LineNr">500 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L501" class="LineNr">501 </span>    e8/call  <a href='058stream-equal.subx.html#L234'>next-stream-line-equal?</a>/disp32
+<span id="L502" class="LineNr">502 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L503" class="LineNr">503 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L504" class="LineNr">504 </span>    <span class="subxComment"># EAX = next-stream-line-equal?(_test-stream, &quot;def&quot;)</span>
+<span id="L505" class="LineNr">505 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L506" class="LineNr">506 </span>    68/push  <span class="Constant">&quot;def&quot;</span>/imm32
+<span id="L507" class="LineNr">507 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L508" class="LineNr">508 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L509" class="LineNr">509 </span>    e8/call  <a href='058stream-equal.subx.html#L234'>next-stream-line-equal?</a>/disp32
+<span id="L510" class="LineNr">510 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L511" class="LineNr">511 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L512" class="LineNr">512 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
+<span id="L513" class="LineNr">513 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L514" class="LineNr">514 </span>    68/push  <span class="Constant">&quot;F - test-next-stream-line-equal-skips-newline&quot;</span>/imm32
+<span id="L515" class="LineNr">515 </span>    68/push  1/imm32
+<span id="L516" class="LineNr">516 </span>    50/push-EAX
+<span id="L517" class="LineNr">517 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L518" class="LineNr">518 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L519" class="LineNr">519 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L520" class="LineNr">520 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L521" class="LineNr">521 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L522" class="LineNr">522 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L523" class="LineNr">523 </span>    5d/pop-to-EBP
+<span id="L524" class="LineNr">524 </span>    c3/return
+<span id="L525" class="LineNr">525 </span>
+<span id="L526" class="LineNr">526 </span><span class="subxTest">test-next-stream-line-equal-handles-final-line</span>:
+<span id="L527" class="LineNr">527 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L528" class="LineNr">528 </span>    55/push-EBP
+<span id="L529" class="LineNr">529 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L530" class="LineNr">530 </span>    <span class="subxComment"># clear-stream(_test-stream)</span>
+<span id="L531" class="LineNr">531 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L532" class="LineNr">532 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L533" class="LineNr">533 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L534" class="LineNr">534 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L535" class="LineNr">535 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L536" class="LineNr">536 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L537" class="LineNr">537 </span>    <span class="subxComment"># write(_test-stream, &quot;Abc\ndef&quot;)</span>
+<span id="L538" class="LineNr">538 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;Abc&quot;)</span>
+<span id="L539" class="LineNr">539 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L540" class="LineNr">540 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
+<span id="L541" class="LineNr">541 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L542" class="LineNr">542 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L543" class="LineNr">543 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
+<span id="L544" class="LineNr">544 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L545" class="LineNr">545 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L546" class="LineNr">546 </span>    <span class="subxS1Comment"># . write(_test-stream, Newline)</span>
+<span id="L547" class="LineNr">547 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L548" class="LineNr">548 </span>    68/push  <span class="SpecialChar"><a href='051test.subx.html#L83'>Newline</a></span>/imm32
+<span id="L549" class="LineNr">549 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L550" class="LineNr">550 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L551" class="LineNr">551 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
+<span id="L552" class="LineNr">552 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L553" class="LineNr">553 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L554" class="LineNr">554 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;def&quot;)</span>
+<span id="L555" class="LineNr">555 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L556" class="LineNr">556 </span>    68/push  <span class="Constant">&quot;def&quot;</span>/imm32
+<span id="L557" class="LineNr">557 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L558" class="LineNr">558 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L559" class="LineNr">559 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
+<span id="L560" class="LineNr">560 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L561" class="LineNr">561 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L562" class="LineNr">562 </span>    <span class="subxComment"># next-stream-line-equal?(_test-stream, &quot;Abc&quot;)</span>
+<span id="L563" class="LineNr">563 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L564" class="LineNr">564 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
+<span id="L565" class="LineNr">565 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L566" class="LineNr">566 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L567" class="LineNr">567 </span>    e8/call  <a href='058stream-equal.subx.html#L234'>next-stream-line-equal?</a>/disp32
+<span id="L568" class="LineNr">568 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L569" class="LineNr">569 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L570" class="LineNr">570 </span>    <span class="subxComment"># EAX = next-stream-line-equal?(_test-stream, &quot;def&quot;)</span>
+<span id="L571" class="LineNr">571 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L572" class="LineNr">572 </span>    68/push  <span class="Constant">&quot;def&quot;</span>/imm32
+<span id="L573" class="LineNr">573 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L574" class="LineNr">574 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L575" class="LineNr">575 </span>    e8/call  <a href='058stream-equal.subx.html#L234'>next-stream-line-equal?</a>/disp32
+<span id="L576" class="LineNr">576 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L577" class="LineNr">577 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L578" class="LineNr">578 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
+<span id="L579" class="LineNr">579 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L580" class="LineNr">580 </span>    68/push  <span class="Constant">&quot;F - test-next-stream-line-equal-skips-newline&quot;</span>/imm32
+<span id="L581" class="LineNr">581 </span>    68/push  1/imm32
+<span id="L582" class="LineNr">582 </span>    50/push-EAX
+<span id="L583" class="LineNr">583 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L584" class="LineNr">584 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L585" class="LineNr">585 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L586" class="LineNr">586 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L587" class="LineNr">587 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L588" class="LineNr">588 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L589" class="LineNr">589 </span>    5d/pop-to-EBP
+<span id="L590" class="LineNr">590 </span>    c3/return
+<span id="L591" class="LineNr">591 </span>
+<span id="L592" class="LineNr">592 </span><span class="subxTest">test-next-stream-line-equal-always-fails-after-Eof</span>:
+<span id="L593" class="LineNr">593 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L594" class="LineNr">594 </span>    55/push-EBP
+<span id="L595" class="LineNr">595 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L596" class="LineNr">596 </span>    <span class="subxComment"># clear-stream(_test-stream)</span>
+<span id="L597" class="LineNr">597 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L598" class="LineNr">598 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L599" class="LineNr">599 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L600" class="LineNr">600 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L601" class="LineNr">601 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L602" class="LineNr">602 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L603" class="LineNr">603 </span>    <span class="subxComment"># write nothing</span>
+<span id="L604" class="LineNr">604 </span>    <span class="subxComment"># EAX = next-stream-line-equal?(_test-stream, &quot;&quot;)</span>
+<span id="L605" class="LineNr">605 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L606" class="LineNr">606 </span>    68/push  <span class="Constant">&quot;&quot;</span>/imm32
+<span id="L607" class="LineNr">607 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L608" class="LineNr">608 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L609" class="LineNr">609 </span>    e8/call  <a href='058stream-equal.subx.html#L234'>next-stream-line-equal?</a>/disp32
+<span id="L610" class="LineNr">610 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L611" class="LineNr">611 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L612" class="LineNr">612 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
+<span id="L613" class="LineNr">613 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L614" class="LineNr">614 </span>    68/push  <span class="Constant">&quot;F - test-next-stream-line-equal-always-fails-after-Eof&quot;</span>/imm32
+<span id="L615" class="LineNr">615 </span>    68/push  1/imm32
+<span id="L616" class="LineNr">616 </span>    50/push-EAX
+<span id="L617" class="LineNr">617 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L618" class="LineNr">618 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L619" class="LineNr">619 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L620" class="LineNr">620 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L621" class="LineNr">621 </span>    <span class="subxComment"># EAX = next-stream-line-equal?(_test-stream, &quot;&quot;)</span>
+<span id="L622" class="LineNr">622 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L623" class="LineNr">623 </span>    68/push  <span class="Constant">&quot;&quot;</span>/imm32
+<span id="L624" class="LineNr">624 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L625" class="LineNr">625 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L626" class="LineNr">626 </span>    e8/call  <a href='058stream-equal.subx.html#L234'>next-stream-line-equal?</a>/disp32
+<span id="L627" class="LineNr">627 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L628" class="LineNr">628 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L629" class="LineNr">629 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
+<span id="L630" class="LineNr">630 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L631" class="LineNr">631 </span>    68/push  <span class="Constant">&quot;F - <a href='058stream-equal.subx.html#L592'>test-next-stream-line-equal-always-fails-after-Eof</a>/2&quot;</span>/imm32
+<span id="L632" class="LineNr">632 </span>    68/push  1/imm32
+<span id="L633" class="LineNr">633 </span>    50/push-EAX
+<span id="L634" class="LineNr">634 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L635" class="LineNr">635 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L636" class="LineNr">636 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L637" class="LineNr">637 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L638" class="LineNr">638 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L639" class="LineNr">639 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L640" class="LineNr">640 </span>    5d/pop-to-EBP
+<span id="L641" class="LineNr">641 </span>    c3/return
+<span id="L642" class="LineNr">642 </span>
+<span id="L643" class="LineNr">643 </span><span class="subxComment"># helper for later tests</span>
+<span id="L644" class="LineNr">644 </span><span class="subxFunction">check-next-stream-line-equal</span>:
+<span id="L645" class="LineNr">645 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L646" class="LineNr">646 </span>    55/push-EBP
+<span id="L647" class="LineNr">647 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L648" class="LineNr">648 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L649" class="LineNr">649 </span>    50/push-EAX
+<span id="L650" class="LineNr">650 </span>    <span class="subxComment"># EAX = next-stream-line-equal?(f, s)</span>
+<span id="L651" class="LineNr">651 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L652" class="LineNr">652 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L653" class="LineNr">653 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L654" class="LineNr">654 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L655" class="LineNr">655 </span>    e8/call  <a href='058stream-equal.subx.html#L234'>next-stream-line-equal?</a>/disp32
+<span id="L656" class="LineNr">656 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L657" class="LineNr">657 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L658" class="LineNr">658 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
+<span id="L659" class="LineNr">659 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L660" class="LineNr">660 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
+<span id="L661" class="LineNr">661 </span>    68/push  1/imm32
+<span id="L662" class="LineNr">662 </span>    50/push-EAX
+<span id="L663" class="LineNr">663 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L664" class="LineNr">664 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L665" class="LineNr">665 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L666" class="LineNr">666 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L667" class="LineNr">667 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L668" class="LineNr">668 </span>    58/pop-to-EAX
+<span id="L669" class="LineNr">669 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L670" class="LineNr">670 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L671" class="LineNr">671 </span>    5d/pop-to-EBP
+<span id="L672" class="LineNr">672 </span>    c3/return
+<span id="L673" class="LineNr">673 </span>
+<span id="L674" class="LineNr">674 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/060read.subx.html b/html/subx/060read.subx.html
index 6f92a1f5..68fa8994 100644
--- a/html/subx/060read.subx.html
+++ b/html/subx/060read.subx.html
@@ -280,7 +280,7 @@ if ('onhashchange' in window) {
 <span id="L219" class="LineNr">219 </span>    68/push  <span class="Constant">&quot;Ab&quot;</span>/imm32
 <span id="L220" class="LineNr">220 </span>    68/push  <a href='060read.subx.html#L345'>_test-tmp-stream</a>/imm32
 <span id="L221" class="LineNr">221 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L222" class="LineNr">222 </span>    e8/call  <a href='058stream-equal.subx.html#L198'>check-stream-equal</a>/disp32
+<span id="L222" class="LineNr">222 </span>    e8/call  <a href='058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
 <span id="L223" class="LineNr">223 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L224" class="LineNr">224 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L225" class="LineNr">225 </span>    <span class="subxComment"># end</span>
@@ -340,7 +340,7 @@ if ('onhashchange' in window) {
 <span id="L279" class="LineNr">279 </span>    68/push  <span class="Constant">&quot;CD&quot;</span>/imm32
 <span id="L280" class="LineNr">280 </span>    68/push  <a href='060read.subx.html#L345'>_test-tmp-stream</a>/imm32
 <span id="L281" class="LineNr">281 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L282" class="LineNr">282 </span>    e8/call  <a href='058stream-equal.subx.html#L198'>check-stream-equal</a>/disp32
+<span id="L282" class="LineNr">282 </span>    e8/call  <a href='058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
 <span id="L283" class="LineNr">283 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L284" class="LineNr">284 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L285" class="LineNr">285 </span>    <span class="subxComment"># end</span>
diff --git a/html/subx/062write-stream.subx.html b/html/subx/062write-stream.subx.html
index 44bff547..7e1053ef 100644
--- a/html/subx/062write-stream.subx.html
+++ b/html/subx/062write-stream.subx.html
@@ -213,7 +213,7 @@ if ('onhashchange' in window) {
 <span id="L152" class="LineNr">152 </span>    68/push  <span class="Constant">&quot;Ab&quot;</span>/imm32
 <span id="L153" class="LineNr">153 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
 <span id="L154" class="LineNr">154 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L155" class="LineNr">155 </span>    e8/call  <a href='058stream-equal.subx.html#L198'>check-stream-equal</a>/disp32
+<span id="L155" class="LineNr">155 </span>    e8/call  <a href='058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
 <span id="L156" class="LineNr">156 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L157" class="LineNr">157 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L158" class="LineNr">158 </span>    <span class="subxS1Comment"># . end</span>
@@ -275,7 +275,7 @@ if ('onhashchange' in window) {
 <span id="L214" class="LineNr">214 </span>    68/push  <span class="Constant">&quot;CD&quot;</span>/imm32
 <span id="L215" class="LineNr">215 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
 <span id="L216" class="LineNr">216 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L217" class="LineNr">217 </span>    e8/call  <a href='058stream-equal.subx.html#L198'>check-stream-equal</a>/disp32
+<span id="L217" class="LineNr">217 </span>    e8/call  <a href='058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
 <span id="L218" class="LineNr">218 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L219" class="LineNr">219 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L220" class="LineNr">220 </span>    <span class="subxS1Comment"># . end</span>
diff --git a/html/subx/064write-byte.subx.html b/html/subx/064write-byte.subx.html
index 259bb8b6..0a6b29a9 100644
--- a/html/subx/064write-byte.subx.html
+++ b/html/subx/064write-byte.subx.html
@@ -206,7 +206,7 @@ if ('onhashchange' in window) {
 <span id="L145" class="LineNr">145 </span>    68/push  <span class="Constant">&quot;A&quot;</span>/imm32
 <span id="L146" class="LineNr">146 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
 <span id="L147" class="LineNr">147 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L148" class="LineNr">148 </span>    e8/call  <a href='058stream-equal.subx.html#L198'>check-stream-equal</a>/disp32
+<span id="L148" class="LineNr">148 </span>    e8/call  <a href='058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
 <span id="L149" class="LineNr">149 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L150" class="LineNr">150 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L151" class="LineNr">151 </span>    <span class="subxS1Comment"># . end</span>
@@ -263,7 +263,7 @@ if ('onhashchange' in window) {
 <span id="L202" class="LineNr">202 </span>    68/push  <span class="Constant">&quot;abcdefg&quot;</span>/imm32
 <span id="L203" class="LineNr">203 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
 <span id="L204" class="LineNr">204 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L205" class="LineNr">205 </span>    e8/call  <a href='058stream-equal.subx.html#L198'>check-stream-equal</a>/disp32
+<span id="L205" class="LineNr">205 </span>    e8/call  <a href='058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
 <span id="L206" class="LineNr">206 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L207" class="LineNr">207 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L208" class="LineNr">208 </span>    <span class="subxS1Comment"># . end</span>
diff --git a/html/subx/066print-byte.subx.html b/html/subx/066print-byte.subx.html
index 9b3bad7a..c84f1269 100644
--- a/html/subx/066print-byte.subx.html
+++ b/html/subx/066print-byte.subx.html
@@ -146,7 +146,7 @@ if ('onhashchange' in window) {
 <span id="L86" class="LineNr">86 </span>    68/push  <span class="Constant">&quot;0a&quot;</span>/imm32
 <span id="L87" class="LineNr">87 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
 <span id="L88" class="LineNr">88 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L89" class="LineNr">89 </span>    e8/call  <a href='058stream-equal.subx.html#L198'>check-stream-equal</a>/disp32
+<span id="L89" class="LineNr">89 </span>    e8/call  <a href='058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
 <span id="L90" class="LineNr">90 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L91" class="LineNr">91 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L92" class="LineNr">92 </span>    <span class="subxS1Comment"># . end</span>
diff --git a/html/subx/067write-buffered.subx.html b/html/subx/067write-buffered.subx.html
index f0d6c4c1..1038c6cc 100644
--- a/html/subx/067write-buffered.subx.html
+++ b/html/subx/067write-buffered.subx.html
@@ -79,7 +79,7 @@ if ('onhashchange' in window) {
 <span id="L18" class="LineNr"> 18 </span>    <span class="subxComment">#   in = msg-&gt;data</span>
 <span id="L19" class="LineNr"> 19 </span>    <span class="subxComment">#   inend = &amp;msg-&gt;data[msg-&gt;length]</span>
 <span id="L20" class="LineNr"> 20 </span>    <span class="subxComment">#   while (in &lt; inend)</span>
-<span id="L21" class="LineNr"> 21 </span>    <span class="subxComment">#     if (f-&gt;write &gt;= f-&gt;length)</span>
+<span id="L21" class="LineNr"> 21 </span>    <span class="subxComment">#     if f-&gt;write &gt;= f-&gt;length</span>
 <span id="L22" class="LineNr"> 22 </span>    <span class="subxComment">#       flush(f)</span>
 <span id="L23" class="LineNr"> 23 </span>    <span class="subxComment">#       clear-stream(f)</span>
 <span id="L24" class="LineNr"> 24 </span>    <span class="subxComment">#     c = *in</span>
@@ -213,7 +213,7 @@ if ('onhashchange' in window) {
 <span id="L152" class="LineNr">152 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
 <span id="L153" class="LineNr">153 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
 <span id="L154" class="LineNr">154 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L155" class="LineNr">155 </span>    e8/call  <a href='058stream-equal.subx.html#L198'>check-stream-equal</a>/disp32
+<span id="L155" class="LineNr">155 </span>    e8/call  <a href='058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
 <span id="L156" class="LineNr">156 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L157" class="LineNr">157 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L158" class="LineNr">158 </span>    <span class="subxS1Comment"># . end</span>
diff --git a/html/subx/071read-line.subx.html b/html/subx/071read-line.subx.html
index 585446ee..557b130a 100644
--- a/html/subx/071read-line.subx.html
+++ b/html/subx/071read-line.subx.html
@@ -18,11 +18,12 @@ a { color:inherit; }
 .Constant { color: #008787; }
 .LineNr { }
 .subxS1Comment { color: #0000af; }
-.SpecialChar { color: #d70000; }
+.CommentedCode { color: #8a8a8a; }
 .subxFunction { color: #af5f00; text-decoration: underline; }
 .subxTest { color: #5f8700; }
 .Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 .subxS2Comment { color: #8a8a8a; }
+.SpecialChar { color: #d70000; }
 .subxH1Comment { color: #005faf; text-decoration: underline; }
 -->
 </style>
@@ -64,303 +65,253 @@ if ('onhashchange' in window) {
 <span id="L3" class="LineNr">  3 </span><span class="subxS1Comment"># . op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L4" class="LineNr">  4 </span><span class="subxS1Comment"># . 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L5" class="LineNr">  5 </span>
-<span id="L6" class="LineNr">  6 </span><span class="subxComment"># read bytes from 'f' until (and including) a newline and store them into 's'</span>
-<span id="L7" class="LineNr">  7 </span><span class="subxComment"># return true if no data found, false otherwise</span>
-<span id="L8" class="LineNr">  8 </span><span class="subxComment"># just abort if 's' is too small</span>
-<span id="L9" class="LineNr">  9 </span><span class="subxFunction">read-line</span>:  <span class="subxComment"># f : (address buffered-file), s : (address stream byte) -&gt; eof?/EAX</span>
-<span id="L10" class="LineNr"> 10 </span>    <span class="subxComment"># pseudocode:</span>
-<span id="L11" class="LineNr"> 11 </span>    <span class="subxComment">#   loop:</span>
-<span id="L12" class="LineNr"> 12 </span>    <span class="subxComment">#     if (s-&gt;write &gt;= s-&gt;length) abort</span>
-<span id="L13" class="LineNr"> 13 </span>    <span class="subxComment">#     if (f-&gt;read &gt;= f-&gt;write) populate stream from file</span>
-<span id="L14" class="LineNr"> 14 </span>    <span class="subxComment">#     if (f-&gt;write == 0) break</span>
-<span id="L15" class="LineNr"> 15 </span>    <span class="subxComment">#     AL = f-&gt;data[f-&gt;read]</span>
-<span id="L16" class="LineNr"> 16 </span>    <span class="subxComment">#     s-&gt;data[s-&gt;write] = AL</span>
-<span id="L17" class="LineNr"> 17 </span>    <span class="subxComment">#     ++f-&gt;read</span>
-<span id="L18" class="LineNr"> 18 </span>    <span class="subxComment">#     ++s-&gt;write</span>
-<span id="L19" class="LineNr"> 19 </span>    <span class="subxComment">#     if (AL == '\n') break</span>
-<span id="L20" class="LineNr"> 20 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L21" class="LineNr"> 21 </span>    55/push-EBP
-<span id="L22" class="LineNr"> 22 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L23" class="LineNr"> 23 </span>    <span class="subxS1Comment"># . save registers</span>
-<span id="L24" class="LineNr"> 24 </span>    51/push-ECX
-<span id="L25" class="LineNr"> 25 </span>    52/push-EDX
-<span id="L26" class="LineNr"> 26 </span>    56/push-ESI
-<span id="L27" class="LineNr"> 27 </span>    57/push-EDI
-<span id="L28" class="LineNr"> 28 </span>    <span class="subxComment"># ESI = f</span>
-<span id="L29" class="LineNr"> 29 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
-<span id="L30" class="LineNr"> 30 </span>    <span class="subxComment"># ECX = f-&gt;read</span>
-<span id="L31" class="LineNr"> 31 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESI+8) to ECX</span>
-<span id="L32" class="LineNr"> 32 </span>    <span class="subxComment"># EDI = s</span>
-<span id="L33" class="LineNr"> 33 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          7/r32/EDI   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDI</span>
-<span id="L34" class="LineNr"> 34 </span>    <span class="subxComment"># EDX = s-&gt;write</span>
-<span id="L35" class="LineNr"> 35 </span>    8b/copy                         0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EDI to EDX</span>
-<span id="L36" class="LineNr"> 36 </span><span class="Constant">$read-line:loop</span>:
-<span id="L37" class="LineNr"> 37 </span>    <span class="subxComment"># if (s-&gt;write &gt;= s-&gt;length) abort</span>
-<span id="L38" class="LineNr"> 38 </span>    3b/compare                      1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># compare EDX with *(EDI+8)</span>
-<span id="L39" class="LineNr"> 39 </span>    7d/jump-if-greater-or-equal  $read-line:abort/disp8
-<span id="L40" class="LineNr"> 40 </span>    <span class="subxComment"># if (f-&gt;read &gt;= f-&gt;write) populate stream from file</span>
-<span id="L41" class="LineNr"> 41 </span>    3b/compare                      1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># compare ECX with *(ESI+4)</span>
-<span id="L42" class="LineNr"> 42 </span>    7c/jump-if-lesser  $read-line:from-stream/disp8
-<span id="L43" class="LineNr"> 43 </span>    <span class="subxS1Comment"># . clear-stream(stream = f+4)</span>
-<span id="L44" class="LineNr"> 44 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L45" class="LineNr"> 45 </span>    8d/copy-address                 1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy ESI+4 to EAX</span>
-<span id="L46" class="LineNr"> 46 </span>    50/push-EAX
-<span id="L47" class="LineNr"> 47 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L48" class="LineNr"> 48 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L49" class="LineNr"> 49 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L50" class="LineNr"> 50 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L51" class="LineNr"> 51 </span>    <span class="subxS1Comment"># . f-&gt;read must now be 0; update its cache at ECX</span>
-<span id="L52" class="LineNr"> 52 </span>    31/xor                          3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear ECX</span>
-<span id="L53" class="LineNr"> 53 </span>    <span class="subxS1Comment"># . EAX = read(f-&gt;fd, stream = f+4)</span>
-<span id="L54" class="LineNr"> 54 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L55" class="LineNr"> 55 </span>    50/push-EAX
-<span id="L56" class="LineNr"> 56 </span>    ff          6/subop/push        0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># push *ESI</span>
-<span id="L57" class="LineNr"> 57 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L58" class="LineNr"> 58 </span>    e8/call  <a href='060read.subx.html#L48'>read</a>/disp32
-<span id="L59" class="LineNr"> 59 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L60" class="LineNr"> 60 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L61" class="LineNr"> 61 </span>    <span class="subxComment"># if (f-&gt;write == 0) return true</span>
-<span id="L62" class="LineNr"> 62 </span>    <span class="subxComment"># since f-&gt;read was initially 0, EAX is the same as f-&gt;write</span>
-<span id="L63" class="LineNr"> 63 </span>    <span class="subxS1Comment"># . if (EAX == 0) return true</span>
-<span id="L64" class="LineNr"> 64 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># compare EAX</span>
-<span id="L65" class="LineNr"> 65 </span>    75/jump-if-not-equal  $read-line:from-stream/disp8
-<span id="L66" class="LineNr"> 66 </span>    b8/copy-to-EAX  0xffffffff/imm32/Eof
-<span id="L67" class="LineNr"> 67 </span>    eb/jump  $read-line:end/disp8
-<span id="L68" class="LineNr"> 68 </span><span class="Constant">$read-line:from-stream</span>:
-<span id="L69" class="LineNr"> 69 </span>    <span class="subxComment"># AL = f-&gt;data[f-&gt;read]</span>
-<span id="L70" class="LineNr"> 70 </span>    31/xor                          3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EAX</span>
-<span id="L71" class="LineNr"> 71 </span>    8a/copy-byte                    1/mod/*+disp8   4/rm32/sib    6/base/ESI  1/index/ECX  <span class="Normal"> . </span>          0/r32/AL    0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *(ESI+ECX+16) to AL</span>
-<span id="L72" class="LineNr"> 72 </span>    <span class="subxComment"># s-&gt;data[s-&gt;write] = AL</span>
-<span id="L73" class="LineNr"> 73 </span>    88/copy-byte                    1/mod/*+disp8   4/rm32/sib    7/base/EDI  2/index/EDX  <span class="Normal"> . </span>          0/r32/AL    0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy AL to *(EDI+EDX+12)</span>
-<span id="L74" class="LineNr"> 74 </span>    <span class="subxComment"># ++f-&gt;read</span>
-<span id="L75" class="LineNr"> 75 </span>    41/increment-ECX
-<span id="L76" class="LineNr"> 76 </span>    <span class="subxComment"># ++s-&gt;write</span>
-<span id="L77" class="LineNr"> 77 </span>    42/increment-EDX
-<span id="L78" class="LineNr"> 78 </span>    <span class="subxComment"># if (AL == '\n') return false</span>
-<span id="L79" class="LineNr"> 79 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xa/imm32         <span class="subxComment"># compare EAX</span>
-<span id="L80" class="LineNr"> 80 </span>    75/jump-if-not-equal  $read-line:loop/disp8
-<span id="L81" class="LineNr"> 81 </span>    31/xor                          3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EAX</span>
-<span id="L82" class="LineNr"> 82 </span><span class="Constant">$read-line:end</span>:
-<span id="L83" class="LineNr"> 83 </span>    <span class="subxComment"># save f-&gt;read</span>
-<span id="L84" class="LineNr"> 84 </span>    89/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy ECX to *(ESI+8)</span>
-<span id="L85" class="LineNr"> 85 </span>    <span class="subxComment"># save s-&gt;write</span>
-<span id="L86" class="LineNr"> 86 </span>    89/copy                         0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EDX to *EDI</span>
-<span id="L87" class="LineNr"> 87 </span>    <span class="subxS1Comment"># . restore registers</span>
-<span id="L88" class="LineNr"> 88 </span>    5f/pop-to-EDI
-<span id="L89" class="LineNr"> 89 </span>    5e/pop-to-ESI
-<span id="L90" class="LineNr"> 90 </span>    5a/pop-to-EDX
-<span id="L91" class="LineNr"> 91 </span>    59/pop-to-ECX
-<span id="L92" class="LineNr"> 92 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L93" class="LineNr"> 93 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L94" class="LineNr"> 94 </span>    5d/pop-to-EBP
-<span id="L95" class="LineNr"> 95 </span>    c3/return
-<span id="L96" class="LineNr"> 96 </span>
-<span id="L97" class="LineNr"> 97 </span><span class="Constant">$read-line:abort</span>:
-<span id="L98" class="LineNr"> 98 </span>    <span class="subxS1Comment"># . _write(2/stderr, error)</span>
-<span id="L99" class="LineNr"> 99 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L100" class="LineNr">100 </span>    68/push  <span class="Constant">&quot;read-line: line too long&quot;</span>/imm32
-<span id="L101" class="LineNr">101 </span>    68/push  2/imm32/stderr
-<span id="L102" class="LineNr">102 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L103" class="LineNr">103 </span>    e8/call  <a href='050_write.subx.html#L14'>_write</a>/disp32
-<span id="L104" class="LineNr">104 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L105" class="LineNr">105 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L106" class="LineNr">106 </span>    <span class="subxS1Comment"># . syscall(exit, 1)</span>
-<span id="L107" class="LineNr">107 </span>    bb/copy-to-EBX  1/imm32
-<span id="L108" class="LineNr">108 </span>    b8/copy-to-EAX  1/imm32/exit
-<span id="L109" class="LineNr">109 </span>    cd/syscall  0x80/imm8
-<span id="L110" class="LineNr">110 </span>    <span class="subxComment"># never gets here</span>
-<span id="L111" class="LineNr">111 </span>
-<span id="L112" class="LineNr">112 </span><span class="subxTest">test-read-line</span>:
-<span id="L113" class="LineNr">113 </span>    <span class="subxH1Comment"># - check that read-line stops at a newline</span>
-<span id="L114" class="LineNr">114 </span>    <span class="subxComment"># setup</span>
-<span id="L115" class="LineNr">115 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
-<span id="L116" class="LineNr">116 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L117" class="LineNr">117 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L118" class="LineNr">118 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L119" class="LineNr">119 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L120" class="LineNr">120 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L121" class="LineNr">121 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L122" class="LineNr">122 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
-<span id="L123" class="LineNr">123 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L124" class="LineNr">124 </span>    b8/copy-to-EAX  <a href='061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L125" class="LineNr">125 </span>    05/add-to-EAX  4/imm32
-<span id="L126" class="LineNr">126 </span>    50/push-EAX
-<span id="L127" class="LineNr">127 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L128" class="LineNr">128 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L129" class="LineNr">129 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L130" class="LineNr">130 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L131" class="LineNr">131 </span>    <span class="subxS1Comment"># . clear-stream(_test-tmp-stream)</span>
-<span id="L132" class="LineNr">132 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L133" class="LineNr">133 </span>    68/push  <a href='060read.subx.html#L345'>_test-tmp-stream</a>/imm32
-<span id="L134" class="LineNr">134 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L135" class="LineNr">135 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L136" class="LineNr">136 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L137" class="LineNr">137 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L138" class="LineNr">138 </span>    <span class="subxComment"># write(_test-stream, &quot;ab\ncd&quot;)</span>
-<span id="L139" class="LineNr">139 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;ab&quot;)</span>
-<span id="L140" class="LineNr">140 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L141" class="LineNr">141 </span>    68/push  <span class="Constant">&quot;ab&quot;</span>/imm32
-<span id="L142" class="LineNr">142 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L143" class="LineNr">143 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L144" class="LineNr">144 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
-<span id="L145" class="LineNr">145 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L146" class="LineNr">146 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L147" class="LineNr">147 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;\n&quot;)</span>
-<span id="L148" class="LineNr">148 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L149" class="LineNr">149 </span>    68/push <span class="SpecialChar"><a href='051test.subx.html#L83'>Newline</a></span>/imm32
-<span id="L150" class="LineNr">150 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L151" class="LineNr">151 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L152" class="LineNr">152 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
-<span id="L153" class="LineNr">153 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L154" class="LineNr">154 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L155" class="LineNr">155 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;cd&quot;)</span>
-<span id="L156" class="LineNr">156 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L157" class="LineNr">157 </span>    68/push  <span class="Constant">&quot;cd&quot;</span>/imm32
-<span id="L158" class="LineNr">158 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L159" class="LineNr">159 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L160" class="LineNr">160 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
-<span id="L161" class="LineNr">161 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L162" class="LineNr">162 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L163" class="LineNr">163 </span>    <span class="subxComment"># read a line from _test-stream (buffered by _test-buffered-file) into _test-tmp-stream</span>
-<span id="L164" class="LineNr">164 </span>    <span class="subxS1Comment"># . EAX = read-line(_test-buffered-file, _test-tmp-stream)</span>
-<span id="L165" class="LineNr">165 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L166" class="LineNr">166 </span>    68/push  <a href='060read.subx.html#L345'>_test-tmp-stream</a>/imm32
-<span id="L167" class="LineNr">167 </span>    68/push  <a href='061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L168" class="LineNr">168 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L169" class="LineNr">169 </span>    e8/call  <a href='071read-line.subx.html#L9'>read-line</a>/disp32
-<span id="L170" class="LineNr">170 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L171" class="LineNr">171 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L172" class="LineNr">172 </span>    <span class="subxComment"># check-ints-equal(EAX, 0/not-at-Eof, msg)</span>
-<span id="L173" class="LineNr">173 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L174" class="LineNr">174 </span>    68/push  <span class="Constant">&quot;F - <a href='071read-line.subx.html#L112'>test-read-line</a>: return value&quot;</span>/imm32
-<span id="L175" class="LineNr">175 </span>    68/push  0/imm32/not-at-Eof
-<span id="L176" class="LineNr">176 </span>    50/push-EAX
-<span id="L177" class="LineNr">177 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L178" class="LineNr">178 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L179" class="LineNr">179 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L180" class="LineNr">180 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L181" class="LineNr">181 </span>    <span class="subxComment"># check-next-stream-line-equal(_test-tmp-stream, &quot;ab&quot;, msg)</span>
-<span id="L182" class="LineNr">182 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L183" class="LineNr">183 </span>    68/push  <span class="Constant">&quot;F - test-read-line&quot;</span>/imm32
-<span id="L184" class="LineNr">184 </span>    68/push  <span class="Constant">&quot;ab&quot;</span>/imm32
-<span id="L185" class="LineNr">185 </span>    68/push  <a href='060read.subx.html#L345'>_test-tmp-stream</a>/imm32
-<span id="L186" class="LineNr">186 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L187" class="LineNr">187 </span>    e8/call  <a href='058stream-equal.subx.html#L643'>check-next-stream-line-equal</a>/disp32
-<span id="L188" class="LineNr">188 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L189" class="LineNr">189 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L190" class="LineNr">190 </span>    <span class="subxComment"># end</span>
-<span id="L191" class="LineNr">191 </span>    c3/return
-<span id="L192" class="LineNr">192 </span>
-<span id="L193" class="LineNr">193 </span><span class="subxTest">test-read-line-returns-true-on-Eof</span>:
-<span id="L194" class="LineNr">194 </span>    <span class="subxComment"># setup</span>
-<span id="L195" class="LineNr">195 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
-<span id="L196" class="LineNr">196 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L197" class="LineNr">197 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L198" class="LineNr">198 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L199" class="LineNr">199 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L200" class="LineNr">200 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L201" class="LineNr">201 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L202" class="LineNr">202 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
-<span id="L203" class="LineNr">203 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L204" class="LineNr">204 </span>    b8/copy-to-EAX  <a href='061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L205" class="LineNr">205 </span>    05/add-to-EAX  4/imm32
-<span id="L206" class="LineNr">206 </span>    50/push-EAX
-<span id="L207" class="LineNr">207 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L208" class="LineNr">208 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L209" class="LineNr">209 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L210" class="LineNr">210 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L211" class="LineNr">211 </span>    <span class="subxS1Comment"># . clear-stream(_test-tmp-stream)</span>
-<span id="L212" class="LineNr">212 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L213" class="LineNr">213 </span>    68/push  <a href='060read.subx.html#L345'>_test-tmp-stream</a>/imm32
-<span id="L214" class="LineNr">214 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L215" class="LineNr">215 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L216" class="LineNr">216 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L217" class="LineNr">217 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L218" class="LineNr">218 </span>    <span class="subxComment"># write nothing</span>
-<span id="L219" class="LineNr">219 </span>    <span class="subxComment"># EAX = read-line(_test-buffered-file, _test-tmp-stream)</span>
-<span id="L220" class="LineNr">220 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L221" class="LineNr">221 </span>    68/push  <a href='060read.subx.html#L345'>_test-tmp-stream</a>/imm32
-<span id="L222" class="LineNr">222 </span>    68/push  <a href='061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L223" class="LineNr">223 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L224" class="LineNr">224 </span>    e8/call  <a href='071read-line.subx.html#L9'>read-line</a>/disp32
-<span id="L225" class="LineNr">225 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L226" class="LineNr">226 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L227" class="LineNr">227 </span>    <span class="subxComment"># check-ints-equal(EAX, Eof, msg)</span>
-<span id="L228" class="LineNr">228 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L229" class="LineNr">229 </span>    68/push  <span class="Constant">&quot;F - test-read-line-returns-true-on-Eof&quot;</span>/imm32
-<span id="L230" class="LineNr">230 </span>    68/push  0xffffffff/imm32/Eof
-<span id="L231" class="LineNr">231 </span>    50/push-EAX
-<span id="L232" class="LineNr">232 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L233" class="LineNr">233 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L234" class="LineNr">234 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L235" class="LineNr">235 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L236" class="LineNr">236 </span>    <span class="subxComment"># end</span>
-<span id="L237" class="LineNr">237 </span>    c3/return
-<span id="L238" class="LineNr">238 </span>
-<span id="L239" class="LineNr">239 </span><span class="subxTest">test-read-line-reads-final-line-until-Eof</span>:
-<span id="L240" class="LineNr">240 </span>    <span class="subxComment"># setup</span>
-<span id="L241" class="LineNr">241 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
-<span id="L242" class="LineNr">242 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L243" class="LineNr">243 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L244" class="LineNr">244 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L245" class="LineNr">245 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L246" class="LineNr">246 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L247" class="LineNr">247 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L248" class="LineNr">248 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
-<span id="L249" class="LineNr">249 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L250" class="LineNr">250 </span>    b8/copy-to-EAX  <a href='061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L251" class="LineNr">251 </span>    05/add-to-EAX  4/imm32
-<span id="L252" class="LineNr">252 </span>    50/push-EAX
-<span id="L253" class="LineNr">253 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L254" class="LineNr">254 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L255" class="LineNr">255 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L256" class="LineNr">256 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L257" class="LineNr">257 </span>    <span class="subxS1Comment"># . clear-stream(_test-tmp-stream)</span>
-<span id="L258" class="LineNr">258 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L259" class="LineNr">259 </span>    68/push  <a href='060read.subx.html#L345'>_test-tmp-stream</a>/imm32
-<span id="L260" class="LineNr">260 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L261" class="LineNr">261 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L262" class="LineNr">262 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L263" class="LineNr">263 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L264" class="LineNr">264 </span>    <span class="subxComment"># write(_test-stream, &quot;cd&quot;)</span>
-<span id="L265" class="LineNr">265 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L266" class="LineNr">266 </span>    68/push  <span class="Constant">&quot;cd&quot;</span>/imm32
-<span id="L267" class="LineNr">267 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L268" class="LineNr">268 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L269" class="LineNr">269 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
-<span id="L270" class="LineNr">270 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L271" class="LineNr">271 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L272" class="LineNr">272 </span>    <span class="subxComment"># read a line from _test-stream (buffered by _test-buffered-file) into _test-tmp-stream</span>
-<span id="L273" class="LineNr">273 </span>    <span class="subxS1Comment"># . EAX = read-line(_test-buffered-file, _test-tmp-stream)</span>
-<span id="L274" class="LineNr">274 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L275" class="LineNr">275 </span>    68/push  <a href='060read.subx.html#L345'>_test-tmp-stream</a>/imm32
-<span id="L276" class="LineNr">276 </span>    68/push  <a href='061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L277" class="LineNr">277 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L278" class="LineNr">278 </span>    e8/call  <a href='071read-line.subx.html#L9'>read-line</a>/disp32
-<span id="L279" class="LineNr">279 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L280" class="LineNr">280 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L281" class="LineNr">281 </span>    <span class="subxComment"># check-ints-equal(EAX, Eof, msg)</span>
-<span id="L282" class="LineNr">282 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L283" class="LineNr">283 </span>    68/push  <span class="Constant">&quot;F - <a href='071read-line.subx.html#L239'>test-read-line-reads-final-line-until-Eof</a>: return value&quot;</span>/imm32
-<span id="L284" class="LineNr">284 </span>    68/push  0xffffffff/imm32/Eof
-<span id="L285" class="LineNr">285 </span>    50/push-EAX
-<span id="L286" class="LineNr">286 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L287" class="LineNr">287 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L288" class="LineNr">288 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L289" class="LineNr">289 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L290" class="LineNr">290 </span>    <span class="subxComment"># check-stream-equal(_test-tmp-stream, &quot;cd&quot;, msg)</span>
-<span id="L291" class="LineNr">291 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L292" class="LineNr">292 </span>    68/push  <span class="Constant">&quot;F - test-read-line-reads-final-line-until-Eof&quot;</span>/imm32
-<span id="L293" class="LineNr">293 </span>    68/push  <span class="Constant">&quot;cd&quot;</span>/imm32
-<span id="L294" class="LineNr">294 </span>    68/push  <a href='060read.subx.html#L345'>_test-tmp-stream</a>/imm32
-<span id="L295" class="LineNr">295 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L296" class="LineNr">296 </span>    e8/call  <a href='058stream-equal.subx.html#L198'>check-stream-equal</a>/disp32
-<span id="L297" class="LineNr">297 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L298" class="LineNr">298 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L299" class="LineNr">299 </span>    <span class="subxComment"># end</span>
-<span id="L300" class="LineNr">300 </span>    c3/return
-<span id="L301" class="LineNr">301 </span>
-<span id="L302" class="LineNr">302 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
+<span id="L6" class="LineNr">  6 </span><span class="CommentedCode">#? Entry:  # run a single test, while debugging</span>
+<span id="L7" class="LineNr">  7 </span><span class="CommentedCode">#?     e8/call test-read-line/disp32</span>
+<span id="L8" class="LineNr">  8 </span><span class="CommentedCode">#?     # syscall(exit, Num-test-failures)</span>
+<span id="L9" class="LineNr">  9 </span><span class="CommentedCode">#?     8b/copy                         0/mod/indirect  5/rm32/.disp32            .             .           3/r32/EBX   Num-test-failures/disp32          # copy *Num-test-failures to EBX</span>
+<span id="L10" class="LineNr"> 10 </span><span class="CommentedCode">#?     b8/copy-to-EAX  1/imm32/exit</span>
+<span id="L11" class="LineNr"> 11 </span><span class="CommentedCode">#?     cd/syscall  0x80/imm8</span>
+<span id="L12" class="LineNr"> 12 </span>
+<span id="L13" class="LineNr"> 13 </span><span class="subxComment"># read bytes from 'f' until (and including) a newline and store them into 's'</span>
+<span id="L14" class="LineNr"> 14 </span><span class="subxComment"># 's' fails to grow if and only if no data found</span>
+<span id="L15" class="LineNr"> 15 </span><span class="subxComment"># just abort if 's' is too small</span>
+<span id="L16" class="LineNr"> 16 </span><span class="subxFunction">read-line</span>:  <span class="subxComment"># f : (address buffered-file), s : (address stream byte) -&gt; &lt;void&gt;</span>
+<span id="L17" class="LineNr"> 17 </span>    <span class="subxComment"># pseudocode:</span>
+<span id="L18" class="LineNr"> 18 </span>    <span class="subxComment">#   while true</span>
+<span id="L19" class="LineNr"> 19 </span>    <span class="subxComment">#     if (s-&gt;write &gt;= s-&gt;length) abort</span>
+<span id="L20" class="LineNr"> 20 </span>    <span class="subxComment">#     if (f-&gt;read &gt;= f-&gt;write) populate stream from file</span>
+<span id="L21" class="LineNr"> 21 </span>    <span class="subxComment">#     if (f-&gt;write == 0) break</span>
+<span id="L22" class="LineNr"> 22 </span>    <span class="subxComment">#     AL = f-&gt;data[f-&gt;read]</span>
+<span id="L23" class="LineNr"> 23 </span>    <span class="subxComment">#     s-&gt;data[s-&gt;write] = AL</span>
+<span id="L24" class="LineNr"> 24 </span>    <span class="subxComment">#     ++f-&gt;read</span>
+<span id="L25" class="LineNr"> 25 </span>    <span class="subxComment">#     ++s-&gt;write</span>
+<span id="L26" class="LineNr"> 26 </span>    <span class="subxComment">#     if (AL == '\n') break</span>
+<span id="L27" class="LineNr"> 27 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L28" class="LineNr"> 28 </span>    55/push-EBP
+<span id="L29" class="LineNr"> 29 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L30" class="LineNr"> 30 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L31" class="LineNr"> 31 </span>    50/push-EAX
+<span id="L32" class="LineNr"> 32 </span>    51/push-ECX
+<span id="L33" class="LineNr"> 33 </span>    52/push-EDX
+<span id="L34" class="LineNr"> 34 </span>    56/push-ESI
+<span id="L35" class="LineNr"> 35 </span>    57/push-EDI
+<span id="L36" class="LineNr"> 36 </span>    <span class="subxComment"># ESI = f</span>
+<span id="L37" class="LineNr"> 37 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
+<span id="L38" class="LineNr"> 38 </span>    <span class="subxComment"># ECX = f-&gt;read</span>
+<span id="L39" class="LineNr"> 39 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESI+8) to ECX</span>
+<span id="L40" class="LineNr"> 40 </span>    <span class="subxComment"># EDI = s</span>
+<span id="L41" class="LineNr"> 41 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          7/r32/EDI   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDI</span>
+<span id="L42" class="LineNr"> 42 </span>    <span class="subxComment"># EDX = s-&gt;write</span>
+<span id="L43" class="LineNr"> 43 </span>    8b/copy                         0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EDI to EDX</span>
+<span id="L44" class="LineNr"> 44 </span><span class="Constant">$read-line:loop</span>:
+<span id="L45" class="LineNr"> 45 </span>    <span class="subxComment"># if (s-&gt;write &gt;= s-&gt;length) abort</span>
+<span id="L46" class="LineNr"> 46 </span>    3b/compare                      1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># compare EDX with *(EDI+8)</span>
+<span id="L47" class="LineNr"> 47 </span>    7d/jump-if-greater-or-equal  $read-line:abort/disp8
+<span id="L48" class="LineNr"> 48 </span>    <span class="subxComment"># if (f-&gt;read &gt;= f-&gt;write) populate stream from file</span>
+<span id="L49" class="LineNr"> 49 </span>    3b/compare                      1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># compare ECX with *(ESI+4)</span>
+<span id="L50" class="LineNr"> 50 </span>    7c/jump-if-lesser  $read-line:from-stream/disp8
+<span id="L51" class="LineNr"> 51 </span>    <span class="subxS1Comment"># . clear-stream(stream = f+4)</span>
+<span id="L52" class="LineNr"> 52 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L53" class="LineNr"> 53 </span>    8d/copy-address                 1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy ESI+4 to EAX</span>
+<span id="L54" class="LineNr"> 54 </span>    50/push-EAX
+<span id="L55" class="LineNr"> 55 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L56" class="LineNr"> 56 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L57" class="LineNr"> 57 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L58" class="LineNr"> 58 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L59" class="LineNr"> 59 </span>    <span class="subxS1Comment"># . f-&gt;read must now be 0; update its cache at ECX</span>
+<span id="L60" class="LineNr"> 60 </span>    31/xor                          3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear ECX</span>
+<span id="L61" class="LineNr"> 61 </span>    <span class="subxS1Comment"># . EAX = read(f-&gt;fd, stream = f+4)</span>
+<span id="L62" class="LineNr"> 62 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L63" class="LineNr"> 63 </span>    50/push-EAX
+<span id="L64" class="LineNr"> 64 </span>    ff          6/subop/push        0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># push *ESI</span>
+<span id="L65" class="LineNr"> 65 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L66" class="LineNr"> 66 </span>    e8/call  <a href='060read.subx.html#L48'>read</a>/disp32
+<span id="L67" class="LineNr"> 67 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L68" class="LineNr"> 68 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L69" class="LineNr"> 69 </span>    <span class="subxComment"># if (f-&gt;write == 0) break</span>
+<span id="L70" class="LineNr"> 70 </span>    <span class="subxComment"># since f-&gt;read was initially 0, EAX is the same as f-&gt;write</span>
+<span id="L71" class="LineNr"> 71 </span>    <span class="subxS1Comment"># . if (EAX == 0) return true</span>
+<span id="L72" class="LineNr"> 72 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># compare EAX</span>
+<span id="L73" class="LineNr"> 73 </span>    74/jump-if-equal  $read-line:end/disp8
+<span id="L74" class="LineNr"> 74 </span><span class="Constant">$read-line:from-stream</span>:
+<span id="L75" class="LineNr"> 75 </span>    <span class="subxComment"># AL = f-&gt;data[f-&gt;read]</span>
+<span id="L76" class="LineNr"> 76 </span>    31/xor                          3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EAX</span>
+<span id="L77" class="LineNr"> 77 </span>    8a/copy-byte                    1/mod/*+disp8   4/rm32/sib    6/base/ESI  1/index/ECX  <span class="Normal"> . </span>          0/r32/AL    0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *(ESI+ECX+16) to AL</span>
+<span id="L78" class="LineNr"> 78 </span>    <span class="subxComment"># s-&gt;data[s-&gt;write] = AL</span>
+<span id="L79" class="LineNr"> 79 </span>    88/copy-byte                    1/mod/*+disp8   4/rm32/sib    7/base/EDI  2/index/EDX  <span class="Normal"> . </span>          0/r32/AL    0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy AL to *(EDI+EDX+12)</span>
+<span id="L80" class="LineNr"> 80 </span>    <span class="subxComment"># ++f-&gt;read</span>
+<span id="L81" class="LineNr"> 81 </span>    41/increment-ECX
+<span id="L82" class="LineNr"> 82 </span>    <span class="subxComment"># ++s-&gt;write</span>
+<span id="L83" class="LineNr"> 83 </span>    42/increment-EDX
+<span id="L84" class="LineNr"> 84 </span>    <span class="subxComment"># if (AL == '\n') return</span>
+<span id="L85" class="LineNr"> 85 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xa/imm32         <span class="subxComment"># compare EAX</span>
+<span id="L86" class="LineNr"> 86 </span>    75/jump-if-not-equal  $read-line:loop/disp8
+<span id="L87" class="LineNr"> 87 </span><span class="Constant">$read-line:end</span>:
+<span id="L88" class="LineNr"> 88 </span>    <span class="subxComment"># save f-&gt;read</span>
+<span id="L89" class="LineNr"> 89 </span>    89/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy ECX to *(ESI+8)</span>
+<span id="L90" class="LineNr"> 90 </span>    <span class="subxComment"># save s-&gt;write</span>
+<span id="L91" class="LineNr"> 91 </span>    89/copy                         0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EDX to *EDI</span>
+<span id="L92" class="LineNr"> 92 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L93" class="LineNr"> 93 </span>    5f/pop-to-EDI
+<span id="L94" class="LineNr"> 94 </span>    5e/pop-to-ESI
+<span id="L95" class="LineNr"> 95 </span>    5a/pop-to-EDX
+<span id="L96" class="LineNr"> 96 </span>    59/pop-to-ECX
+<span id="L97" class="LineNr"> 97 </span>    58/pop-to-EAX
+<span id="L98" class="LineNr"> 98 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L99" class="LineNr"> 99 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L100" class="LineNr">100 </span>    5d/pop-to-EBP
+<span id="L101" class="LineNr">101 </span>    c3/return
+<span id="L102" class="LineNr">102 </span>
+<span id="L103" class="LineNr">103 </span><span class="Constant">$read-line:abort</span>:
+<span id="L104" class="LineNr">104 </span>    <span class="subxS1Comment"># . _write(2/stderr, error)</span>
+<span id="L105" class="LineNr">105 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L106" class="LineNr">106 </span>    68/push  <span class="Constant">&quot;read-line: line too long&quot;</span>/imm32
+<span id="L107" class="LineNr">107 </span>    68/push  2/imm32/stderr
+<span id="L108" class="LineNr">108 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L109" class="LineNr">109 </span>    e8/call  <a href='050_write.subx.html#L14'>_write</a>/disp32
+<span id="L110" class="LineNr">110 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L111" class="LineNr">111 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L112" class="LineNr">112 </span>    <span class="subxS1Comment"># . _write(2/stderr, Newline)</span>
+<span id="L113" class="LineNr">113 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L114" class="LineNr">114 </span>    68/push  <span class="SpecialChar"><a href='051test.subx.html#L83'>Newline</a></span>/imm32
+<span id="L115" class="LineNr">115 </span>    68/push  2/imm32/stderr
+<span id="L116" class="LineNr">116 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L117" class="LineNr">117 </span>    e8/call  <a href='050_write.subx.html#L14'>_write</a>/disp32
+<span id="L118" class="LineNr">118 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L119" class="LineNr">119 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L120" class="LineNr">120 </span>    <span class="subxS1Comment"># . syscall(exit, 1)</span>
+<span id="L121" class="LineNr">121 </span>    bb/copy-to-EBX  1/imm32
+<span id="L122" class="LineNr">122 </span>    b8/copy-to-EAX  1/imm32/exit
+<span id="L123" class="LineNr">123 </span>    cd/syscall  0x80/imm8
+<span id="L124" class="LineNr">124 </span>    <span class="subxComment"># never gets here</span>
+<span id="L125" class="LineNr">125 </span>
+<span id="L126" class="LineNr">126 </span><span class="subxTest">test-read-line</span>:
+<span id="L127" class="LineNr">127 </span>    <span class="subxH1Comment"># - check that read-line stops at a newline</span>
+<span id="L128" class="LineNr">128 </span>    <span class="subxComment"># setup</span>
+<span id="L129" class="LineNr">129 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L130" class="LineNr">130 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L131" class="LineNr">131 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L132" class="LineNr">132 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L133" class="LineNr">133 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L134" class="LineNr">134 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L135" class="LineNr">135 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L136" class="LineNr">136 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
+<span id="L137" class="LineNr">137 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L138" class="LineNr">138 </span>    b8/copy-to-EAX  <a href='061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L139" class="LineNr">139 </span>    05/add-to-EAX  4/imm32
+<span id="L140" class="LineNr">140 </span>    50/push-EAX
+<span id="L141" class="LineNr">141 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L142" class="LineNr">142 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L143" class="LineNr">143 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L144" class="LineNr">144 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L145" class="LineNr">145 </span>    <span class="subxS1Comment"># . clear-stream(_test-tmp-stream)</span>
+<span id="L146" class="LineNr">146 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L147" class="LineNr">147 </span>    68/push  <a href='060read.subx.html#L345'>_test-tmp-stream</a>/imm32
+<span id="L148" class="LineNr">148 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L149" class="LineNr">149 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L150" class="LineNr">150 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L151" class="LineNr">151 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L152" class="LineNr">152 </span>    <span class="subxComment"># write(_test-stream, &quot;ab\ncd&quot;)</span>
+<span id="L153" class="LineNr">153 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;ab&quot;)</span>
+<span id="L154" class="LineNr">154 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L155" class="LineNr">155 </span>    68/push  <span class="Constant">&quot;ab&quot;</span>/imm32
+<span id="L156" class="LineNr">156 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L157" class="LineNr">157 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L158" class="LineNr">158 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
+<span id="L159" class="LineNr">159 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L160" class="LineNr">160 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L161" class="LineNr">161 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;\n&quot;)</span>
+<span id="L162" class="LineNr">162 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L163" class="LineNr">163 </span>    68/push <span class="SpecialChar"><a href='051test.subx.html#L83'>Newline</a></span>/imm32
+<span id="L164" class="LineNr">164 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L165" class="LineNr">165 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L166" class="LineNr">166 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
+<span id="L167" class="LineNr">167 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L168" class="LineNr">168 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L169" class="LineNr">169 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;cd&quot;)</span>
+<span id="L170" class="LineNr">170 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L171" class="LineNr">171 </span>    68/push  <span class="Constant">&quot;cd&quot;</span>/imm32
+<span id="L172" class="LineNr">172 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L173" class="LineNr">173 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L174" class="LineNr">174 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
+<span id="L175" class="LineNr">175 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L176" class="LineNr">176 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L177" class="LineNr">177 </span>    <span class="subxComment"># read a line from _test-stream (buffered by _test-buffered-file) into _test-tmp-stream</span>
+<span id="L178" class="LineNr">178 </span>    <span class="subxS1Comment"># . EAX = read-line(_test-buffered-file, _test-tmp-stream)</span>
+<span id="L179" class="LineNr">179 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L180" class="LineNr">180 </span>    68/push  <a href='060read.subx.html#L345'>_test-tmp-stream</a>/imm32
+<span id="L181" class="LineNr">181 </span>    68/push  <a href='061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L182" class="LineNr">182 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L183" class="LineNr">183 </span>    e8/call  <a href='071read-line.subx.html#L16'>read-line</a>/disp32
+<span id="L184" class="LineNr">184 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L185" class="LineNr">185 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L186" class="LineNr">186 </span>    <span class="subxComment"># check-next-stream-line-equal(_test-tmp-stream, &quot;ab&quot;, msg)</span>
+<span id="L187" class="LineNr">187 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L188" class="LineNr">188 </span>    68/push  <span class="Constant">&quot;F - test-read-line&quot;</span>/imm32
+<span id="L189" class="LineNr">189 </span>    68/push  <span class="Constant">&quot;ab&quot;</span>/imm32
+<span id="L190" class="LineNr">190 </span>    68/push  <a href='060read.subx.html#L345'>_test-tmp-stream</a>/imm32
+<span id="L191" class="LineNr">191 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L192" class="LineNr">192 </span>    e8/call  <a href='058stream-equal.subx.html#L644'>check-next-stream-line-equal</a>/disp32
+<span id="L193" class="LineNr">193 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L194" class="LineNr">194 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L195" class="LineNr">195 </span>    <span class="subxComment"># end</span>
+<span id="L196" class="LineNr">196 </span>    c3/return
+<span id="L197" class="LineNr">197 </span>
+<span id="L198" class="LineNr">198 </span><span class="subxTest">test-read-line-reads-final-line-until-Eof</span>:
+<span id="L199" class="LineNr">199 </span>    <span class="subxComment"># setup</span>
+<span id="L200" class="LineNr">200 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L201" class="LineNr">201 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L202" class="LineNr">202 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L203" class="LineNr">203 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L204" class="LineNr">204 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L205" class="LineNr">205 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L206" class="LineNr">206 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L207" class="LineNr">207 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
+<span id="L208" class="LineNr">208 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L209" class="LineNr">209 </span>    b8/copy-to-EAX  <a href='061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L210" class="LineNr">210 </span>    05/add-to-EAX  4/imm32
+<span id="L211" class="LineNr">211 </span>    50/push-EAX
+<span id="L212" class="LineNr">212 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L213" class="LineNr">213 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L214" class="LineNr">214 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L215" class="LineNr">215 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L216" class="LineNr">216 </span>    <span class="subxS1Comment"># . clear-stream(_test-tmp-stream)</span>
+<span id="L217" class="LineNr">217 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L218" class="LineNr">218 </span>    68/push  <a href='060read.subx.html#L345'>_test-tmp-stream</a>/imm32
+<span id="L219" class="LineNr">219 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L220" class="LineNr">220 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L221" class="LineNr">221 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L222" class="LineNr">222 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L223" class="LineNr">223 </span>    <span class="subxComment"># write(_test-stream, &quot;cd&quot;)</span>
+<span id="L224" class="LineNr">224 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L225" class="LineNr">225 </span>    68/push  <span class="Constant">&quot;cd&quot;</span>/imm32
+<span id="L226" class="LineNr">226 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L227" class="LineNr">227 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L228" class="LineNr">228 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
+<span id="L229" class="LineNr">229 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L230" class="LineNr">230 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L231" class="LineNr">231 </span>    <span class="subxComment"># read a line from _test-stream (buffered by _test-buffered-file) into _test-tmp-stream</span>
+<span id="L232" class="LineNr">232 </span>    <span class="subxS1Comment"># . EAX = read-line(_test-buffered-file, _test-tmp-stream)</span>
+<span id="L233" class="LineNr">233 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L234" class="LineNr">234 </span>    68/push  <a href='060read.subx.html#L345'>_test-tmp-stream</a>/imm32
+<span id="L235" class="LineNr">235 </span>    68/push  <a href='061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L236" class="LineNr">236 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L237" class="LineNr">237 </span>    e8/call  <a href='071read-line.subx.html#L16'>read-line</a>/disp32
+<span id="L238" class="LineNr">238 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L239" class="LineNr">239 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L240" class="LineNr">240 </span>    <span class="subxComment"># check-stream-equal(_test-tmp-stream, &quot;cd&quot;, msg)</span>
+<span id="L241" class="LineNr">241 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L242" class="LineNr">242 </span>    68/push  <span class="Constant">&quot;F - test-read-line-reads-final-line-until-Eof&quot;</span>/imm32
+<span id="L243" class="LineNr">243 </span>    68/push  <span class="Constant">&quot;cd&quot;</span>/imm32
+<span id="L244" class="LineNr">244 </span>    68/push  <a href='060read.subx.html#L345'>_test-tmp-stream</a>/imm32
+<span id="L245" class="LineNr">245 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L246" class="LineNr">246 </span>    e8/call  <a href='058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
+<span id="L247" class="LineNr">247 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L248" class="LineNr">248 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L249" class="LineNr">249 </span>    <span class="subxComment"># end</span>
+<span id="L250" class="LineNr">250 </span>    c3/return
+<span id="L251" class="LineNr">251 </span>
+<span id="L252" class="LineNr">252 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/072slice.subx.html b/html/subx/072slice.subx.html
index 10e75e80..95b18d2a 100644
--- a/html/subx/072slice.subx.html
+++ b/html/subx/072slice.subx.html
@@ -87,7 +87,7 @@ if ('onhashchange' in window) {
 <span id="L25" class="LineNr"> 25 </span>    <span class="subxComment"># if (s-&gt;start == s-&gt;end) return true</span>
 <span id="L26" class="LineNr"> 26 </span>    <span class="subxS1Comment"># . EAX = s-&gt;start</span>
 <span id="L27" class="LineNr"> 27 </span>    8b/copy                         0/mod/indirect  1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ECX to EAX</span>
-<span id="L28" class="LineNr"> 28 </span>    <span class="subxS1Comment"># . compare EAX with s-&gt;end</span>
+<span id="L28" class="LineNr"> 28 </span>    <span class="subxS1Comment"># . compare EAX and s-&gt;end</span>
 <span id="L29" class="LineNr"> 29 </span>    39/compare                      1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># compare EAX and *(ECX+4)</span>
 <span id="L30" class="LineNr"> 30 </span>    b8/copy-to-EAX  1/imm32/true
 <span id="L31" class="LineNr"> 31 </span>    74/jump-if-equal  $slice-empty?:end/disp8
@@ -164,7 +164,7 @@ if ('onhashchange' in window) {
 <span id="L102" class="LineNr">102 </span>    <span class="subxComment">#   maxs = s-&gt;end</span>
 <span id="L103" class="LineNr">103 </span>    <span class="subxComment">#   if (maxs - currs != p-&gt;length) return false</span>
 <span id="L104" class="LineNr">104 </span>    <span class="subxComment">#   currp = p-&gt;data</span>
-<span id="L105" class="LineNr">105 </span>    <span class="subxComment">#   while (currs &lt; maxs)</span>
+<span id="L105" class="LineNr">105 </span>    <span class="subxComment">#   while currs &lt; maxs</span>
 <span id="L106" class="LineNr">106 </span>    <span class="subxComment">#     if (*currs != *currp) return false</span>
 <span id="L107" class="LineNr">107 </span>    <span class="subxComment">#     ++currs</span>
 <span id="L108" class="LineNr">108 </span>    <span class="subxComment">#     ++currp</span>
@@ -206,7 +206,7 @@ if ('onhashchange' in window) {
 <span id="L144" class="LineNr">144 </span>    31/xor                          3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear ECX</span>
 <span id="L145" class="LineNr">145 </span><span class="Constant">$slice-equal?:loop</span>:
 <span id="L146" class="LineNr">146 </span>    <span class="subxComment"># if (currs &gt;= maxs) return true</span>
-<span id="L147" class="LineNr">147 </span>    39/compare                      3/mod/direct    2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EDX and ESI</span>
+<span id="L147" class="LineNr">147 </span>    39/compare                      3/mod/direct    2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EDX with ESI</span>
 <span id="L148" class="LineNr">148 </span>    7d/jump-if-greater-or-equal  $slice-equal?:true/disp8
 <span id="L149" class="LineNr">149 </span>    <span class="subxComment"># AL = *currp</span>
 <span id="L150" class="LineNr">150 </span>    8a/copy-byte                    0/mod/indirect  3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/AL   <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *EBX to AL</span>
@@ -242,8 +242,8 @@ if ('onhashchange' in window) {
 <span id="L180" class="LineNr">180 </span>    55/push-EBP
 <span id="L181" class="LineNr">181 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L182" class="LineNr">182 </span>    <span class="subxComment"># var slice/ECX</span>
-<span id="L183" class="LineNr">183 </span>    68/push  <a href='072slice.subx.html#L915'>_test-slice-data-3</a>/imm32/end
-<span id="L184" class="LineNr">184 </span>    68/push  <a href='072slice.subx.html#L909'>_test-slice-data-0</a>/imm32/start
+<span id="L183" class="LineNr">183 </span>    68/push  <a href='072slice.subx.html#L919'>_test-slice-data-3</a>/imm32/end
+<span id="L184" class="LineNr">184 </span>    68/push  <a href='072slice.subx.html#L913'>_test-slice-data-0</a>/imm32/start
 <span id="L185" class="LineNr">185 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
 <span id="L186" class="LineNr">186 </span>    <span class="subxComment"># EAX = slice-equal?(ECX, &quot;Abc&quot;)</span>
 <span id="L187" class="LineNr">187 </span>    <span class="subxS2Comment"># . . push args</span>
@@ -273,8 +273,8 @@ if ('onhashchange' in window) {
 <span id="L211" class="LineNr">211 </span>    55/push-EBP
 <span id="L212" class="LineNr">212 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L213" class="LineNr">213 </span>    <span class="subxComment"># var slice/ECX</span>
-<span id="L214" class="LineNr">214 </span>    68/push  <a href='072slice.subx.html#L917'>_test-slice-data-4</a>/imm32/end
-<span id="L215" class="LineNr">215 </span>    68/push  <a href='072slice.subx.html#L911'>_test-slice-data-1</a>/imm32/start
+<span id="L214" class="LineNr">214 </span>    68/push  <a href='072slice.subx.html#L921'>_test-slice-data-4</a>/imm32/end
+<span id="L215" class="LineNr">215 </span>    68/push  <a href='072slice.subx.html#L915'>_test-slice-data-1</a>/imm32/start
 <span id="L216" class="LineNr">216 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
 <span id="L217" class="LineNr">217 </span>    <span class="subxComment"># EAX = slice-equal?(ECX, &quot;Abc&quot;)</span>
 <span id="L218" class="LineNr">218 </span>    <span class="subxS2Comment"># . . push args</span>
@@ -304,8 +304,8 @@ if ('onhashchange' in window) {
 <span id="L242" class="LineNr">242 </span>    55/push-EBP
 <span id="L243" class="LineNr">243 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L244" class="LineNr">244 </span>    <span class="subxComment"># var slice/ECX</span>
-<span id="L245" class="LineNr">245 </span>    68/push  <a href='072slice.subx.html#L917'>_test-slice-data-4</a>/imm32/end
-<span id="L246" class="LineNr">246 </span>    68/push  <a href='072slice.subx.html#L909'>_test-slice-data-0</a>/imm32/start
+<span id="L245" class="LineNr">245 </span>    68/push  <a href='072slice.subx.html#L921'>_test-slice-data-4</a>/imm32/end
+<span id="L246" class="LineNr">246 </span>    68/push  <a href='072slice.subx.html#L913'>_test-slice-data-0</a>/imm32/start
 <span id="L247" class="LineNr">247 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
 <span id="L248" class="LineNr">248 </span>    <span class="subxComment"># EAX = slice-equal?(ECX, &quot;Abc&quot;)</span>
 <span id="L249" class="LineNr">249 </span>    <span class="subxS2Comment"># . . push args</span>
@@ -335,8 +335,8 @@ if ('onhashchange' in window) {
 <span id="L273" class="LineNr">273 </span>    55/push-EBP
 <span id="L274" class="LineNr">274 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L275" class="LineNr">275 </span>    <span class="subxComment"># var slice/ECX</span>
-<span id="L276" class="LineNr">276 </span>    68/push  <a href='072slice.subx.html#L911'>_test-slice-data-1</a>/imm32/end
-<span id="L277" class="LineNr">277 </span>    68/push  <a href='072slice.subx.html#L909'>_test-slice-data-0</a>/imm32/start
+<span id="L276" class="LineNr">276 </span>    68/push  <a href='072slice.subx.html#L915'>_test-slice-data-1</a>/imm32/end
+<span id="L277" class="LineNr">277 </span>    68/push  <a href='072slice.subx.html#L913'>_test-slice-data-0</a>/imm32/start
 <span id="L278" class="LineNr">278 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
 <span id="L279" class="LineNr">279 </span>    <span class="subxComment"># EAX = slice-equal?(ECX, &quot;Abc&quot;)</span>
 <span id="L280" class="LineNr">280 </span>    <span class="subxS2Comment"># . . push args</span>
@@ -366,8 +366,8 @@ if ('onhashchange' in window) {
 <span id="L304" class="LineNr">304 </span>    55/push-EBP
 <span id="L305" class="LineNr">305 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L306" class="LineNr">306 </span>    <span class="subxComment"># var slice/ECX</span>
-<span id="L307" class="LineNr">307 </span>    68/push  <a href='072slice.subx.html#L909'>_test-slice-data-0</a>/imm32/end
-<span id="L308" class="LineNr">308 </span>    68/push  <a href='072slice.subx.html#L909'>_test-slice-data-0</a>/imm32/start
+<span id="L307" class="LineNr">307 </span>    68/push  <a href='072slice.subx.html#L913'>_test-slice-data-0</a>/imm32/end
+<span id="L308" class="LineNr">308 </span>    68/push  <a href='072slice.subx.html#L913'>_test-slice-data-0</a>/imm32/start
 <span id="L309" class="LineNr">309 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
 <span id="L310" class="LineNr">310 </span>    <span class="subxComment"># EAX = slice-equal?(ECX, &quot;Abc&quot;)</span>
 <span id="L311" class="LineNr">311 </span>    <span class="subxS2Comment"># . . push args</span>
@@ -397,8 +397,8 @@ if ('onhashchange' in window) {
 <span id="L335" class="LineNr">335 </span>    55/push-EBP
 <span id="L336" class="LineNr">336 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L337" class="LineNr">337 </span>    <span class="subxComment"># var slice/ECX</span>
-<span id="L338" class="LineNr">338 </span>    68/push  <a href='072slice.subx.html#L913'>_test-slice-data-2</a>/imm32/end
-<span id="L339" class="LineNr">339 </span>    68/push  <a href='072slice.subx.html#L909'>_test-slice-data-0</a>/imm32/start
+<span id="L338" class="LineNr">338 </span>    68/push  <a href='072slice.subx.html#L917'>_test-slice-data-2</a>/imm32/end
+<span id="L339" class="LineNr">339 </span>    68/push  <a href='072slice.subx.html#L913'>_test-slice-data-0</a>/imm32/start
 <span id="L340" class="LineNr">340 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
 <span id="L341" class="LineNr">341 </span>    <span class="subxComment"># EAX = slice-equal?(ECX, &quot;&quot;)</span>
 <span id="L342" class="LineNr">342 </span>    <span class="subxS2Comment"># . . push args</span>
@@ -428,8 +428,8 @@ if ('onhashchange' in window) {
 <span id="L366" class="LineNr">366 </span>    55/push-EBP
 <span id="L367" class="LineNr">367 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L368" class="LineNr">368 </span>    <span class="subxComment"># var slice/ECX</span>
-<span id="L369" class="LineNr">369 </span>    68/push  <a href='072slice.subx.html#L909'>_test-slice-data-0</a>/imm32/end
-<span id="L370" class="LineNr">370 </span>    68/push  <a href='072slice.subx.html#L909'>_test-slice-data-0</a>/imm32/start
+<span id="L369" class="LineNr">369 </span>    68/push  <a href='072slice.subx.html#L913'>_test-slice-data-0</a>/imm32/end
+<span id="L370" class="LineNr">370 </span>    68/push  <a href='072slice.subx.html#L913'>_test-slice-data-0</a>/imm32/start
 <span id="L371" class="LineNr">371 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
 <span id="L372" class="LineNr">372 </span>    <span class="subxComment"># EAX = slice-equal?(ECX, &quot;&quot;)</span>
 <span id="L373" class="LineNr">373 </span>    <span class="subxS2Comment"># . . push args</span>
@@ -546,8 +546,8 @@ if ('onhashchange' in window) {
 <span id="L484" class="LineNr">484 </span>    55/push-EBP
 <span id="L485" class="LineNr">485 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L486" class="LineNr">486 </span>    <span class="subxComment"># var slice/ECX</span>
-<span id="L487" class="LineNr">487 </span>    68/push  <a href='072slice.subx.html#L915'>_test-slice-data-3</a>/imm32/end
-<span id="L488" class="LineNr">488 </span>    68/push  <a href='072slice.subx.html#L909'>_test-slice-data-0</a>/imm32/start
+<span id="L487" class="LineNr">487 </span>    68/push  <a href='072slice.subx.html#L919'>_test-slice-data-3</a>/imm32/end
+<span id="L488" class="LineNr">488 </span>    68/push  <a href='072slice.subx.html#L913'>_test-slice-data-0</a>/imm32/start
 <span id="L489" class="LineNr">489 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
 <span id="L490" class="LineNr">490 </span>    <span class="subxComment"># EAX = slice-starts-with?(ECX, &quot;A&quot;)</span>
 <span id="L491" class="LineNr">491 </span>    <span class="subxS2Comment"># . . push args</span>
@@ -577,8 +577,8 @@ if ('onhashchange' in window) {
 <span id="L515" class="LineNr">515 </span>    55/push-EBP
 <span id="L516" class="LineNr">516 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L517" class="LineNr">517 </span>    <span class="subxComment"># var slice/ECX</span>
-<span id="L518" class="LineNr">518 </span>    68/push  <a href='072slice.subx.html#L915'>_test-slice-data-3</a>/imm32/end
-<span id="L519" class="LineNr">519 </span>    68/push  <a href='072slice.subx.html#L909'>_test-slice-data-0</a>/imm32/start
+<span id="L518" class="LineNr">518 </span>    68/push  <a href='072slice.subx.html#L919'>_test-slice-data-3</a>/imm32/end
+<span id="L519" class="LineNr">519 </span>    68/push  <a href='072slice.subx.html#L913'>_test-slice-data-0</a>/imm32/start
 <span id="L520" class="LineNr">520 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
 <span id="L521" class="LineNr">521 </span>    <span class="subxComment"># EAX = slice-starts-with?(ECX, &quot;&quot;)</span>
 <span id="L522" class="LineNr">522 </span>    <span class="subxS2Comment"># . . push args</span>
@@ -608,8 +608,8 @@ if ('onhashchange' in window) {
 <span id="L546" class="LineNr">546 </span>    55/push-EBP
 <span id="L547" class="LineNr">547 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L548" class="LineNr">548 </span>    <span class="subxComment"># var slice/ECX</span>
-<span id="L549" class="LineNr">549 </span>    68/push  <a href='072slice.subx.html#L915'>_test-slice-data-3</a>/imm32/end
-<span id="L550" class="LineNr">550 </span>    68/push  <a href='072slice.subx.html#L909'>_test-slice-data-0</a>/imm32/start
+<span id="L549" class="LineNr">549 </span>    68/push  <a href='072slice.subx.html#L919'>_test-slice-data-3</a>/imm32/end
+<span id="L550" class="LineNr">550 </span>    68/push  <a href='072slice.subx.html#L913'>_test-slice-data-0</a>/imm32/start
 <span id="L551" class="LineNr">551 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
 <span id="L552" class="LineNr">552 </span>    <span class="subxComment"># EAX = slice-starts-with?(ECX, &quot;Ab&quot;)</span>
 <span id="L553" class="LineNr">553 </span>    <span class="subxS2Comment"># . . push args</span>
@@ -639,8 +639,8 @@ if ('onhashchange' in window) {
 <span id="L577" class="LineNr">577 </span>    55/push-EBP
 <span id="L578" class="LineNr">578 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L579" class="LineNr">579 </span>    <span class="subxComment"># var slice/ECX</span>
-<span id="L580" class="LineNr">580 </span>    68/push  <a href='072slice.subx.html#L915'>_test-slice-data-3</a>/imm32/end
-<span id="L581" class="LineNr">581 </span>    68/push  <a href='072slice.subx.html#L909'>_test-slice-data-0</a>/imm32/start
+<span id="L580" class="LineNr">580 </span>    68/push  <a href='072slice.subx.html#L919'>_test-slice-data-3</a>/imm32/end
+<span id="L581" class="LineNr">581 </span>    68/push  <a href='072slice.subx.html#L913'>_test-slice-data-0</a>/imm32/start
 <span id="L582" class="LineNr">582 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
 <span id="L583" class="LineNr">583 </span>    <span class="subxComment"># EAX = slice-starts-with?(ECX, &quot;Abc&quot;)</span>
 <span id="L584" class="LineNr">584 </span>    <span class="subxS2Comment"># . . push args</span>
@@ -670,8 +670,8 @@ if ('onhashchange' in window) {
 <span id="L608" class="LineNr">608 </span>    55/push-EBP
 <span id="L609" class="LineNr">609 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L610" class="LineNr">610 </span>    <span class="subxComment"># var slice/ECX</span>
-<span id="L611" class="LineNr">611 </span>    68/push  <a href='072slice.subx.html#L915'>_test-slice-data-3</a>/imm32/end
-<span id="L612" class="LineNr">612 </span>    68/push  <a href='072slice.subx.html#L909'>_test-slice-data-0</a>/imm32/start
+<span id="L611" class="LineNr">611 </span>    68/push  <a href='072slice.subx.html#L919'>_test-slice-data-3</a>/imm32/end
+<span id="L612" class="LineNr">612 </span>    68/push  <a href='072slice.subx.html#L913'>_test-slice-data-0</a>/imm32/start
 <span id="L613" class="LineNr">613 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
 <span id="L614" class="LineNr">614 </span>    <span class="subxComment"># EAX = slice-starts-with?(ECX, &quot;Abd&quot;)</span>
 <span id="L615" class="LineNr">615 </span>    <span class="subxS2Comment"># . . push args</span>
@@ -701,8 +701,8 @@ if ('onhashchange' in window) {
 <span id="L639" class="LineNr">639 </span>    55/push-EBP
 <span id="L640" class="LineNr">640 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L641" class="LineNr">641 </span>    <span class="subxComment"># var slice/ECX</span>
-<span id="L642" class="LineNr">642 </span>    68/push  <a href='072slice.subx.html#L915'>_test-slice-data-3</a>/imm32/end
-<span id="L643" class="LineNr">643 </span>    68/push  <a href='072slice.subx.html#L909'>_test-slice-data-0</a>/imm32/start
+<span id="L642" class="LineNr">642 </span>    68/push  <a href='072slice.subx.html#L919'>_test-slice-data-3</a>/imm32/end
+<span id="L643" class="LineNr">643 </span>    68/push  <a href='072slice.subx.html#L913'>_test-slice-data-0</a>/imm32/start
 <span id="L644" class="LineNr">644 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
 <span id="L645" class="LineNr">645 </span>    <span class="subxComment"># EAX = slice-starts-with?(ECX, &quot;Ac&quot;)</span>
 <span id="L646" class="LineNr">646 </span>    <span class="subxS2Comment"># . . push args</span>
@@ -743,29 +743,29 @@ if ('onhashchange' in window) {
 <span id="L681" class="LineNr">681 </span>    8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ESI to ECX</span>
 <span id="L682" class="LineNr">682 </span>    <span class="subxComment"># max/ESI = s-&gt;end</span>
 <span id="L683" class="LineNr">683 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESI+4) to ESI</span>
-<span id="L684" class="LineNr">684 </span>    <span class="subxComment"># EDI = f</span>
+<span id="L684" class="LineNr">684 </span>    <span class="subxComment"># EDI = out</span>
 <span id="L685" class="LineNr">685 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>                        7/r32/EDI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EDI</span>
-<span id="L686" class="LineNr">686 </span>    <span class="subxComment"># EDX = f-&gt;length</span>
+<span id="L686" class="LineNr">686 </span>    <span class="subxComment"># EDX = out-&gt;length</span>
 <span id="L687" class="LineNr">687 </span>    8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EDI+12) to EDX</span>
-<span id="L688" class="LineNr">688 </span>    <span class="subxComment"># EBX = f-&gt;write</span>
+<span id="L688" class="LineNr">688 </span>    <span class="subxComment"># EBX = out-&gt;write</span>
 <span id="L689" class="LineNr">689 </span>    8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EDI+4) to EBX</span>
 <span id="L690" class="LineNr">690 </span><span class="Constant">$write-slice:loop</span>:
 <span id="L691" class="LineNr">691 </span>    <span class="subxComment"># if (curr &gt;= max) break</span>
 <span id="L692" class="LineNr">692 </span>    39/compare                      3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare ECX with ESI</span>
 <span id="L693" class="LineNr">693 </span>    7d/jump-if-greater-or-equal  $write-slice:loop-end/disp8
-<span id="L694" class="LineNr">694 </span>    <span class="subxComment"># if (f-&gt;write &gt;= f-&gt;length) flush and clear f's stream</span>
+<span id="L694" class="LineNr">694 </span>    <span class="subxComment"># if (out-&gt;write &gt;= out-&gt;length) flush and clear out's stream</span>
 <span id="L695" class="LineNr">695 </span>    39/compare                      3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EBX with EDX</span>
 <span id="L696" class="LineNr">696 </span>    7c/jump-if-lesser  $write-slice:to-stream/disp8
-<span id="L697" class="LineNr">697 </span>    <span class="subxS1Comment"># . persist f-&gt;write</span>
+<span id="L697" class="LineNr">697 </span>    <span class="subxS1Comment"># . persist out-&gt;write</span>
 <span id="L698" class="LineNr">698 </span>    89/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EBX to *(EDI+4)</span>
-<span id="L699" class="LineNr">699 </span>    <span class="subxS1Comment"># . flush(f)</span>
+<span id="L699" class="LineNr">699 </span>    <span class="subxS1Comment"># . flush(out)</span>
 <span id="L700" class="LineNr">700 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L701" class="LineNr">701 </span>    57/push-EDI
 <span id="L702" class="LineNr">702 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L703" class="LineNr">703 </span>    e8/call  <a href='064write-byte.subx.html#L79'>flush</a>/disp32
 <span id="L704" class="LineNr">704 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L705" class="LineNr">705 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L706" class="LineNr">706 </span>    <span class="subxS1Comment"># . clear-stream(stream = f+4)</span>
+<span id="L706" class="LineNr">706 </span>    <span class="subxS1Comment"># . clear-stream(stream = out+4)</span>
 <span id="L707" class="LineNr">707 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L708" class="LineNr">708 </span>    8d/copy-address                 1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EDI+4 to EAX</span>
 <span id="L709" class="LineNr">709 </span>    50/push-EAX
@@ -773,16 +773,16 @@ if ('onhashchange' in window) {
 <span id="L711" class="LineNr">711 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
 <span id="L712" class="LineNr">712 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L713" class="LineNr">713 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L714" class="LineNr">714 </span>    <span class="subxS1Comment"># . f-&gt;write must now be 0; update its cache at EBX</span>
+<span id="L714" class="LineNr">714 </span>    <span class="subxS1Comment"># . out-&gt;write must now be 0; update its cache at EBX</span>
 <span id="L715" class="LineNr">715 </span>    31/xor                          3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EBX</span>
 <span id="L716" class="LineNr">716 </span><span class="Constant">$write-slice:to-stream</span>:
-<span id="L717" class="LineNr">717 </span>    <span class="subxComment"># f-&gt;data[f-&gt;write] = *in</span>
+<span id="L717" class="LineNr">717 </span>    <span class="subxComment"># out-&gt;data[out-&gt;write] = *in</span>
 <span id="L718" class="LineNr">718 </span>    <span class="subxS1Comment"># . AL = *in</span>
 <span id="L719" class="LineNr">719 </span>    31/xor                          3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EAX</span>
 <span id="L720" class="LineNr">720 </span>    8a/copy-byte                    0/mod/indirect  1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/AL   <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *ECX to AL</span>
-<span id="L721" class="LineNr">721 </span>    <span class="subxS1Comment"># . f-&gt;data[f-&gt;write] = AL</span>
+<span id="L721" class="LineNr">721 </span>    <span class="subxS1Comment"># . out-&gt;data[out-&gt;write] = AL</span>
 <span id="L722" class="LineNr">722 </span>    88/copy-byte                    1/mod/*+disp8   4/rm32/sib    7/base/EDI  3/index/EBX  <span class="Normal"> . </span>          0/r32/AL    0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># copy AL to *(EDI+EBX+16)</span>
-<span id="L723" class="LineNr">723 </span>    <span class="subxComment"># ++f-&gt;write</span>
+<span id="L723" class="LineNr">723 </span>    <span class="subxComment"># ++out-&gt;write</span>
 <span id="L724" class="LineNr">724 </span>    43/increment-EBX
 <span id="L725" class="LineNr">725 </span>    <span class="subxComment"># ++in</span>
 <span id="L726" class="LineNr">726 </span>    41/increment-ECX
@@ -825,8 +825,8 @@ if ('onhashchange' in window) {
 <span id="L763" class="LineNr">763 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L764" class="LineNr">764 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L765" class="LineNr">765 </span>    <span class="subxComment"># var slice/ECX = &quot;Abc&quot;</span>
-<span id="L766" class="LineNr">766 </span>    68/push  <a href='072slice.subx.html#L915'>_test-slice-data-3</a>/imm32/end
-<span id="L767" class="LineNr">767 </span>    68/push  <a href='072slice.subx.html#L909'>_test-slice-data-0</a>/imm32/start
+<span id="L766" class="LineNr">766 </span>    68/push  <a href='072slice.subx.html#L919'>_test-slice-data-3</a>/imm32/end
+<span id="L767" class="LineNr">767 </span>    68/push  <a href='072slice.subx.html#L913'>_test-slice-data-0</a>/imm32/start
 <span id="L768" class="LineNr">768 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
 <span id="L769" class="LineNr">769 </span>    <span class="subxComment"># write-slice(_test-buffered-file, slice)</span>
 <span id="L770" class="LineNr">770 </span>    <span class="subxS2Comment"># . . push args</span>
@@ -849,7 +849,7 @@ if ('onhashchange' in window) {
 <span id="L787" class="LineNr">787 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
 <span id="L788" class="LineNr">788 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
 <span id="L789" class="LineNr">789 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L790" class="LineNr">790 </span>    e8/call  <a href='058stream-equal.subx.html#L198'>check-stream-equal</a>/disp32
+<span id="L790" class="LineNr">790 </span>    e8/call  <a href='058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
 <span id="L791" class="LineNr">791 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L792" class="LineNr">792 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L793" class="LineNr">793 </span>    <span class="subxS1Comment"># . epilog</span>
@@ -862,123 +862,127 @@ if ('onhashchange' in window) {
 <span id="L800" class="LineNr">800 </span><span class="subxComment">#   - construct a 'maximal slice' and pass it to write-slice</span>
 <span id="L801" class="LineNr">801 </span><span class="subxComment">#   - flush the buffered-file and pass the stream directly to its fd (disabling buffering)</span>
 <span id="L802" class="LineNr">802 </span><span class="subxComment"># we'll go with the first way for now</span>
-<span id="L803" class="LineNr">803 </span><span class="subxFunction">write-stream-buffered</span>:  <span class="subxComment"># f : (address buffered-file), s : (address stream)</span>
+<span id="L803" class="LineNr">803 </span><span class="subxFunction">write-stream-buffered</span>:  <span class="subxComment"># f : (address buffered-file), s : (address stream) -&gt; &lt;void&gt;</span>
 <span id="L804" class="LineNr">804 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L805" class="LineNr">805 </span>    55/push-EBP
 <span id="L806" class="LineNr">806 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L807" class="LineNr">807 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L808" class="LineNr">808 </span>    50/push-EAX
-<span id="L809" class="LineNr">809 </span>    56/push-ESI
-<span id="L810" class="LineNr">810 </span>    <span class="subxComment"># ESI = s</span>
-<span id="L811" class="LineNr">811 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to ESI</span>
-<span id="L812" class="LineNr">812 </span>    <span class="subxComment"># var slice/ECX = {s-&gt;data, s-&gt;data + s-&gt;write}</span>
-<span id="L813" class="LineNr">813 </span>    <span class="subxS1Comment"># . push s-&gt;data + s-&gt;write</span>
-<span id="L814" class="LineNr">814 </span>    8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ESI to EAX</span>
-<span id="L815" class="LineNr">815 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  0/index/EAX  <span class="Normal"> . </span>          0/r32/EAX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy ESI+EAX+12 to EAX</span>
-<span id="L816" class="LineNr">816 </span>    50/push-EAX
-<span id="L817" class="LineNr">817 </span>    <span class="subxS1Comment"># . push s-&gt;data</span>
-<span id="L818" class="LineNr">818 </span>    8d/copy-address                 1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy ESI+12 to EAX</span>
-<span id="L819" class="LineNr">819 </span>    50/push-EAX
-<span id="L820" class="LineNr">820 </span>    <span class="subxS1Comment"># . ECX = ESP</span>
-<span id="L821" class="LineNr">821 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
-<span id="L822" class="LineNr">822 </span>    <span class="subxComment"># write-slice(f, slice)</span>
-<span id="L823" class="LineNr">823 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L824" class="LineNr">824 </span>    51/push-ECX
-<span id="L825" class="LineNr">825 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
-<span id="L826" class="LineNr">826 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L827" class="LineNr">827 </span>    e8/call  <a href='072slice.subx.html#L667'>write-slice</a>/disp32
-<span id="L828" class="LineNr">828 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L829" class="LineNr">829 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L830" class="LineNr">830 </span><span class="Constant">$write-stream-buffered:end</span>:
-<span id="L831" class="LineNr">831 </span>    <span class="subxS1Comment"># . restore registers</span>
-<span id="L832" class="LineNr">832 </span>    5e/pop-to-ESI
-<span id="L833" class="LineNr">833 </span>    58/pop-to-EAX
-<span id="L834" class="LineNr">834 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L835" class="LineNr">835 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L836" class="LineNr">836 </span>    5d/pop-to-EBP
-<span id="L837" class="LineNr">837 </span>    c3/return
-<span id="L838" class="LineNr">838 </span>
-<span id="L839" class="LineNr">839 </span><span class="subxTest">test-write-stream-buffered</span>:
-<span id="L840" class="LineNr">840 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L841" class="LineNr">841 </span>    55/push-EBP
-<span id="L842" class="LineNr">842 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L843" class="LineNr">843 </span>    <span class="subxComment"># setup</span>
-<span id="L844" class="LineNr">844 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
-<span id="L845" class="LineNr">845 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L846" class="LineNr">846 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L847" class="LineNr">847 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L848" class="LineNr">848 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L849" class="LineNr">849 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L850" class="LineNr">850 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L851" class="LineNr">851 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
-<span id="L852" class="LineNr">852 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L853" class="LineNr">853 </span>    b8/copy-to-EAX  <a href='061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L854" class="LineNr">854 </span>    05/add-to-EAX  4/imm32
-<span id="L855" class="LineNr">855 </span>    50/push-EAX
-<span id="L856" class="LineNr">856 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L857" class="LineNr">857 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L858" class="LineNr">858 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L859" class="LineNr">859 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L860" class="LineNr">860 </span>    <span class="subxS1Comment"># . clear-stream(_test-tmp-stream)</span>
-<span id="L861" class="LineNr">861 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L862" class="LineNr">862 </span>    68/push  <a href='060read.subx.html#L345'>_test-tmp-stream</a>/imm32
-<span id="L863" class="LineNr">863 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L864" class="LineNr">864 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L865" class="LineNr">865 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L866" class="LineNr">866 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L867" class="LineNr">867 </span>    <span class="subxComment"># initialize input</span>
-<span id="L868" class="LineNr">868 </span>    <span class="subxS1Comment"># . write(_test-tmp-stream, &quot;abcd&quot;)</span>
-<span id="L869" class="LineNr">869 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L870" class="LineNr">870 </span>    68/push  <span class="Constant">&quot;abcd&quot;</span>/imm32
-<span id="L871" class="LineNr">871 </span>    68/push  <a href='060read.subx.html#L345'>_test-tmp-stream</a>/imm32
-<span id="L872" class="LineNr">872 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L873" class="LineNr">873 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
-<span id="L874" class="LineNr">874 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L875" class="LineNr">875 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L876" class="LineNr">876 </span>    <span class="subxComment"># perform the write-stream-buffered</span>
-<span id="L877" class="LineNr">877 </span>    <span class="subxS1Comment"># . write-stream-buffered(_test-buffered-file, _test-tmp-stream)</span>
-<span id="L878" class="LineNr">878 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L879" class="LineNr">879 </span>    68/push  <a href='060read.subx.html#L345'>_test-tmp-stream</a>/imm32
-<span id="L880" class="LineNr">880 </span>    68/push  <a href='061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L881" class="LineNr">881 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L882" class="LineNr">882 </span>    e8/call  <a href='072slice.subx.html#L803'>write-stream-buffered</a>/disp32
-<span id="L883" class="LineNr">883 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L884" class="LineNr">884 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L885" class="LineNr">885 </span>    <span class="subxComment"># check that the write happened as expected</span>
-<span id="L886" class="LineNr">886 </span>    <span class="subxS1Comment"># . flush(_test-buffered-file)</span>
-<span id="L887" class="LineNr">887 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L888" class="LineNr">888 </span>    68/push  <a href='061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L889" class="LineNr">889 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L890" class="LineNr">890 </span>    e8/call  <a href='064write-byte.subx.html#L79'>flush</a>/disp32
-<span id="L891" class="LineNr">891 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L892" class="LineNr">892 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L893" class="LineNr">893 </span>    <span class="subxS1Comment"># . check-stream-equal(_test-stream, &quot;abcd&quot;, msg)</span>
-<span id="L894" class="LineNr">894 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L895" class="LineNr">895 </span>    68/push  <span class="Constant">&quot;F - test-write-stream-buffered&quot;</span>/imm32
-<span id="L896" class="LineNr">896 </span>    68/push  <span class="Constant">&quot;abcd&quot;</span>/imm32
-<span id="L897" class="LineNr">897 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L898" class="LineNr">898 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L899" class="LineNr">899 </span>    e8/call  <a href='058stream-equal.subx.html#L198'>check-stream-equal</a>/disp32
-<span id="L900" class="LineNr">900 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L901" class="LineNr">901 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L902" class="LineNr">902 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L903" class="LineNr">903 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L904" class="LineNr">904 </span>    5d/pop-to-EBP
-<span id="L905" class="LineNr">905 </span>    c3/return
-<span id="L906" class="LineNr">906 </span>
-<span id="L907" class="LineNr">907 </span>== data
-<span id="L908" class="LineNr">908 </span>
-<span id="L909" class="LineNr">909 </span><span class="subxMinorFunction">_test-slice-data-0</span>:
-<span id="L910" class="LineNr">910 </span>    41/A
-<span id="L911" class="LineNr">911 </span><span class="subxMinorFunction">_test-slice-data-1</span>:
-<span id="L912" class="LineNr">912 </span>    62/b
-<span id="L913" class="LineNr">913 </span><span class="subxMinorFunction">_test-slice-data-2</span>:
-<span id="L914" class="LineNr">914 </span>    63/c
-<span id="L915" class="LineNr">915 </span><span class="subxMinorFunction">_test-slice-data-3</span>:
-<span id="L916" class="LineNr">916 </span>    64/d
-<span id="L917" class="LineNr">917 </span><span class="subxMinorFunction">_test-slice-data-4</span>:
-<span id="L918" class="LineNr">918 </span>
-<span id="L919" class="LineNr">919 </span><span class="subxS1Comment"># . _. vim&#0058;nowrap:textwidth=0</span>
+<span id="L809" class="LineNr">809 </span>    51/push-ECX
+<span id="L810" class="LineNr">810 </span>    56/push-ESI
+<span id="L811" class="LineNr">811 </span>    <span class="subxComment"># ESI = s</span>
+<span id="L812" class="LineNr">812 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to ESI</span>
+<span id="L813" class="LineNr">813 </span>    <span class="subxComment"># var slice/ECX = {s-&gt;data, s-&gt;data + s-&gt;write}</span>
+<span id="L814" class="LineNr">814 </span>    <span class="subxS1Comment"># . push s-&gt;data + s-&gt;write</span>
+<span id="L815" class="LineNr">815 </span>    8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ESI to EAX</span>
+<span id="L816" class="LineNr">816 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  0/index/EAX  <span class="Normal"> . </span>          0/r32/EAX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy ESI+EAX+12 to EAX</span>
+<span id="L817" class="LineNr">817 </span>    50/push-EAX
+<span id="L818" class="LineNr">818 </span>    <span class="subxS1Comment"># . push s-&gt;data</span>
+<span id="L819" class="LineNr">819 </span>    8d/copy-address                 1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy ESI+12 to EAX</span>
+<span id="L820" class="LineNr">820 </span>    50/push-EAX
+<span id="L821" class="LineNr">821 </span>    <span class="subxS1Comment"># . ECX = ESP</span>
+<span id="L822" class="LineNr">822 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L823" class="LineNr">823 </span>    <span class="subxComment"># write-slice(f, slice)</span>
+<span id="L824" class="LineNr">824 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L825" class="LineNr">825 </span>    51/push-ECX
+<span id="L826" class="LineNr">826 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L827" class="LineNr">827 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L828" class="LineNr">828 </span>    e8/call  <a href='072slice.subx.html#L667'>write-slice</a>/disp32
+<span id="L829" class="LineNr">829 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L830" class="LineNr">830 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L831" class="LineNr">831 </span><span class="Constant">$write-stream-buffered:end</span>:
+<span id="L832" class="LineNr">832 </span>    <span class="subxS1Comment"># . restore locals</span>
+<span id="L833" class="LineNr">833 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L834" class="LineNr">834 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L835" class="LineNr">835 </span>    5e/pop-to-ESI
+<span id="L836" class="LineNr">836 </span>    59/pop-to-ECX
+<span id="L837" class="LineNr">837 </span>    58/pop-to-EAX
+<span id="L838" class="LineNr">838 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L839" class="LineNr">839 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L840" class="LineNr">840 </span>    5d/pop-to-EBP
+<span id="L841" class="LineNr">841 </span>    c3/return
+<span id="L842" class="LineNr">842 </span>
+<span id="L843" class="LineNr">843 </span><span class="subxTest">test-write-stream-buffered</span>:
+<span id="L844" class="LineNr">844 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L845" class="LineNr">845 </span>    55/push-EBP
+<span id="L846" class="LineNr">846 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L847" class="LineNr">847 </span>    <span class="subxComment"># setup</span>
+<span id="L848" class="LineNr">848 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L849" class="LineNr">849 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L850" class="LineNr">850 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L851" class="LineNr">851 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L852" class="LineNr">852 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L853" class="LineNr">853 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L854" class="LineNr">854 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L855" class="LineNr">855 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
+<span id="L856" class="LineNr">856 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L857" class="LineNr">857 </span>    b8/copy-to-EAX  <a href='061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L858" class="LineNr">858 </span>    05/add-to-EAX  4/imm32
+<span id="L859" class="LineNr">859 </span>    50/push-EAX
+<span id="L860" class="LineNr">860 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L861" class="LineNr">861 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L862" class="LineNr">862 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L863" class="LineNr">863 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L864" class="LineNr">864 </span>    <span class="subxS1Comment"># . clear-stream(_test-tmp-stream)</span>
+<span id="L865" class="LineNr">865 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L866" class="LineNr">866 </span>    68/push  <a href='060read.subx.html#L345'>_test-tmp-stream</a>/imm32
+<span id="L867" class="LineNr">867 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L868" class="LineNr">868 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L869" class="LineNr">869 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L870" class="LineNr">870 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L871" class="LineNr">871 </span>    <span class="subxComment"># initialize input</span>
+<span id="L872" class="LineNr">872 </span>    <span class="subxS1Comment"># . write(_test-tmp-stream, &quot;abcd&quot;)</span>
+<span id="L873" class="LineNr">873 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L874" class="LineNr">874 </span>    68/push  <span class="Constant">&quot;abcd&quot;</span>/imm32
+<span id="L875" class="LineNr">875 </span>    68/push  <a href='060read.subx.html#L345'>_test-tmp-stream</a>/imm32
+<span id="L876" class="LineNr">876 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L877" class="LineNr">877 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
+<span id="L878" class="LineNr">878 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L879" class="LineNr">879 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L880" class="LineNr">880 </span>    <span class="subxComment"># perform the write-stream-buffered</span>
+<span id="L881" class="LineNr">881 </span>    <span class="subxS1Comment"># . write-stream-buffered(_test-buffered-file, _test-tmp-stream)</span>
+<span id="L882" class="LineNr">882 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L883" class="LineNr">883 </span>    68/push  <a href='060read.subx.html#L345'>_test-tmp-stream</a>/imm32
+<span id="L884" class="LineNr">884 </span>    68/push  <a href='061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L885" class="LineNr">885 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L886" class="LineNr">886 </span>    e8/call  <a href='072slice.subx.html#L803'>write-stream-buffered</a>/disp32
+<span id="L887" class="LineNr">887 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L888" class="LineNr">888 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L889" class="LineNr">889 </span>    <span class="subxComment"># check that the write happened as expected</span>
+<span id="L890" class="LineNr">890 </span>    <span class="subxS1Comment"># . flush(_test-buffered-file)</span>
+<span id="L891" class="LineNr">891 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L892" class="LineNr">892 </span>    68/push  <a href='061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L893" class="LineNr">893 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L894" class="LineNr">894 </span>    e8/call  <a href='064write-byte.subx.html#L79'>flush</a>/disp32
+<span id="L895" class="LineNr">895 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L896" class="LineNr">896 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L897" class="LineNr">897 </span>    <span class="subxS1Comment"># . check-stream-equal(_test-stream, &quot;abcd&quot;, msg)</span>
+<span id="L898" class="LineNr">898 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L899" class="LineNr">899 </span>    68/push  <span class="Constant">&quot;F - test-write-stream-buffered&quot;</span>/imm32
+<span id="L900" class="LineNr">900 </span>    68/push  <span class="Constant">&quot;abcd&quot;</span>/imm32
+<span id="L901" class="LineNr">901 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L902" class="LineNr">902 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L903" class="LineNr">903 </span>    e8/call  <a href='058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
+<span id="L904" class="LineNr">904 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L905" class="LineNr">905 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L906" class="LineNr">906 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L907" class="LineNr">907 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L908" class="LineNr">908 </span>    5d/pop-to-EBP
+<span id="L909" class="LineNr">909 </span>    c3/return
+<span id="L910" class="LineNr">910 </span>
+<span id="L911" class="LineNr">911 </span>== data
+<span id="L912" class="LineNr">912 </span>
+<span id="L913" class="LineNr">913 </span><span class="subxMinorFunction">_test-slice-data-0</span>:
+<span id="L914" class="LineNr">914 </span>    41/A
+<span id="L915" class="LineNr">915 </span><span class="subxMinorFunction">_test-slice-data-1</span>:
+<span id="L916" class="LineNr">916 </span>    62/b
+<span id="L917" class="LineNr">917 </span><span class="subxMinorFunction">_test-slice-data-2</span>:
+<span id="L918" class="LineNr">918 </span>    63/c
+<span id="L919" class="LineNr">919 </span><span class="subxMinorFunction">_test-slice-data-3</span>:
+<span id="L920" class="LineNr">920 </span>    64/d
+<span id="L921" class="LineNr">921 </span><span class="subxMinorFunction">_test-slice-data-4</span>:
+<span id="L922" class="LineNr">922 </span>
+<span id="L923" class="LineNr">923 </span><span class="subxS1Comment"># . _. vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/073next-token.subx.html b/html/subx/073next-token.subx.html
index 5a18170b..2ddf6c3a 100644
--- a/html/subx/073next-token.subx.html
+++ b/html/subx/073next-token.subx.html
@@ -102,7 +102,7 @@ if ('onhashchange' in window) {
 <span id="L42" class="LineNr"> 42 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L43" class="LineNr"> 43 </span>    56/push-ESI
 <span id="L44" class="LineNr"> 44 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L45" class="LineNr"> 45 </span>    e8/call  <a href='073next-token.subx.html#L468'>skip-chars-not-matching</a>/disp32
+<span id="L45" class="LineNr"> 45 </span>    e8/call  <a href='073next-token.subx.html#L470'>skip-chars-not-matching</a>/disp32
 <span id="L46" class="LineNr"> 46 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L47" class="LineNr"> 47 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L48" class="LineNr"> 48 </span>    <span class="subxComment"># out-&gt;end = &amp;in-&gt;data[in-&gt;read]</span>
@@ -246,7 +246,7 @@ if ('onhashchange' in window) {
 <span id="L186" class="LineNr">186 </span>    51/push-ECX
 <span id="L187" class="LineNr">187 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L188" class="LineNr">188 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L189" class="LineNr">189 </span>    e8/call  <a href='073next-token.subx.html#L628'>skip-chars-matching-in-slice</a>/disp32
+<span id="L189" class="LineNr">189 </span>    e8/call  <a href='073next-token.subx.html#L682'>skip-chars-matching-in-slice</a>/disp32
 <span id="L190" class="LineNr">190 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L191" class="LineNr">191 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L192" class="LineNr">192 </span>    <span class="subxComment"># out-&gt;start = EAX</span>
@@ -257,7 +257,7 @@ if ('onhashchange' in window) {
 <span id="L197" class="LineNr">197 </span>    51/push-ECX
 <span id="L198" class="LineNr">198 </span>    50/push-EAX
 <span id="L199" class="LineNr">199 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L200" class="LineNr">200 </span>    e8/call  <a href='073next-token.subx.html#L724'>skip-chars-not-matching-in-slice</a>/disp32
+<span id="L200" class="LineNr">200 </span>    e8/call  <a href='073next-token.subx.html#L778'>skip-chars-not-matching-in-slice</a>/disp32
 <span id="L201" class="LineNr">201 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L202" class="LineNr">202 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L203" class="LineNr">203 </span>    <span class="subxComment"># out-&gt;end = EAX</span>
@@ -411,501 +411,555 @@ if ('onhashchange' in window) {
 <span id="L351" class="LineNr">351 </span>    50/push-EAX
 <span id="L352" class="LineNr">352 </span>    51/push-ECX
 <span id="L353" class="LineNr">353 </span>    52/push-EDX
-<span id="L354" class="LineNr">354 </span>    56/push-ESI
-<span id="L355" class="LineNr">355 </span>    <span class="subxComment"># ESI = in</span>
-<span id="L356" class="LineNr">356 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
-<span id="L357" class="LineNr">357 </span>    <span class="subxComment"># ECX = in-&gt;read</span>
-<span id="L358" class="LineNr">358 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESI+4) to ECX</span>
-<span id="L359" class="LineNr">359 </span>    <span class="subxComment"># EBX = in-&gt;write</span>
-<span id="L360" class="LineNr">360 </span>    8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ESI to EBX</span>
-<span id="L361" class="LineNr">361 </span>    <span class="subxComment"># EDX = delimiter</span>
-<span id="L362" class="LineNr">362 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDX</span>
-<span id="L363" class="LineNr">363 </span><span class="Constant">$skip-chars-matching:loop</span>:
-<span id="L364" class="LineNr">364 </span>    <span class="subxComment"># if (in-&gt;read &gt;= in-&gt;write) break</span>
-<span id="L365" class="LineNr">365 </span>    39/compare                      3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare ECX with EBX</span>
-<span id="L366" class="LineNr">366 </span>    7d/jump-if-greater-or-equal  $skip-chars-matching:end/disp8
-<span id="L367" class="LineNr">367 </span>    <span class="subxComment"># EAX = in-&gt;data[in-&gt;read]</span>
-<span id="L368" class="LineNr">368 </span>    31/xor                          3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EAX</span>
-<span id="L369" class="LineNr">369 </span>    8a/copy-byte                    1/mod/*+disp8   4/rm32/sib    6/base/ESI  1/index/ECX  <span class="Normal"> . </span>          0/r32/AL    0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *(ESI+ECX+12) to AL</span>
-<span id="L370" class="LineNr">370 </span>    <span class="subxComment"># if (EAX != delimiter) break</span>
-<span id="L371" class="LineNr">371 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX and EDX</span>
-<span id="L372" class="LineNr">372 </span>    75/jump-if-not-equal  $skip-chars-matching:end/disp8
-<span id="L373" class="LineNr">373 </span>    <span class="subxComment"># ++in-&gt;read</span>
-<span id="L374" class="LineNr">374 </span>    41/inc-ECX
-<span id="L375" class="LineNr">375 </span>    eb/jump  $skip-chars-matching:loop/disp8
-<span id="L376" class="LineNr">376 </span><span class="Constant">$skip-chars-matching:end</span>:
-<span id="L377" class="LineNr">377 </span>    <span class="subxComment"># persist in-&gt;read</span>
-<span id="L378" class="LineNr">378 </span>    89/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy ECX to *(ESI+4)</span>
-<span id="L379" class="LineNr">379 </span>    <span class="subxS1Comment"># . restore registers</span>
-<span id="L380" class="LineNr">380 </span>    5e/pop-to-ESI
-<span id="L381" class="LineNr">381 </span>    5a/pop-to-EDX
-<span id="L382" class="LineNr">382 </span>    59/pop-to-ECX
-<span id="L383" class="LineNr">383 </span>    58/pop-to-EAX
-<span id="L384" class="LineNr">384 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L385" class="LineNr">385 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L386" class="LineNr">386 </span>    5d/pop-to-EBP
-<span id="L387" class="LineNr">387 </span>    c3/return
-<span id="L388" class="LineNr">388 </span>
-<span id="L389" class="LineNr">389 </span><span class="subxTest">test-skip-chars-matching</span>:
-<span id="L390" class="LineNr">390 </span>    <span class="subxComment"># setup</span>
-<span id="L391" class="LineNr">391 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
-<span id="L392" class="LineNr">392 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L393" class="LineNr">393 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L394" class="LineNr">394 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L395" class="LineNr">395 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L396" class="LineNr">396 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L397" class="LineNr">397 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L398" class="LineNr">398 </span>    <span class="subxComment"># write(_test-stream, &quot;  ab&quot;)</span>
-<span id="L399" class="LineNr">399 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L400" class="LineNr">400 </span>    68/push  <span class="Constant">&quot;  ab&quot;</span>/imm32
-<span id="L401" class="LineNr">401 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L402" class="LineNr">402 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L403" class="LineNr">403 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
-<span id="L404" class="LineNr">404 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L405" class="LineNr">405 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L406" class="LineNr">406 </span>    <span class="subxComment"># skip-chars-matching(_test-stream, 0x20/space)</span>
-<span id="L407" class="LineNr">407 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L408" class="LineNr">408 </span>    68/push  0x20/imm32
-<span id="L409" class="LineNr">409 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L410" class="LineNr">410 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L411" class="LineNr">411 </span>    e8/call  <a href='073next-token.subx.html#L346'>skip-chars-matching</a>/disp32
-<span id="L412" class="LineNr">412 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L413" class="LineNr">413 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L414" class="LineNr">414 </span>    <span class="subxComment"># check-ints-equal(_test-stream-&gt;read, 2, msg)</span>
-<span id="L415" class="LineNr">415 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L416" class="LineNr">416 </span>    68/push  <span class="Constant">&quot;F - test-skip-chars-matching&quot;</span>/imm32
-<span id="L417" class="LineNr">417 </span>    68/push  2/imm32
-<span id="L418" class="LineNr">418 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;read</span>
-<span id="L419" class="LineNr">419 </span>    b8/copy-to-EAX  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L420" class="LineNr">420 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+4)</span>
-<span id="L421" class="LineNr">421 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L422" class="LineNr">422 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L423" class="LineNr">423 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L424" class="LineNr">424 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L425" class="LineNr">425 </span>    <span class="subxComment"># end</span>
-<span id="L426" class="LineNr">426 </span>    c3/return
-<span id="L427" class="LineNr">427 </span>
-<span id="L428" class="LineNr">428 </span><span class="subxTest">test-skip-chars-matching-none</span>:
-<span id="L429" class="LineNr">429 </span>    <span class="subxComment"># setup</span>
-<span id="L430" class="LineNr">430 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
-<span id="L431" class="LineNr">431 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L432" class="LineNr">432 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L433" class="LineNr">433 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L434" class="LineNr">434 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L435" class="LineNr">435 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L436" class="LineNr">436 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L437" class="LineNr">437 </span>    <span class="subxComment"># write(_test-stream, &quot;ab&quot;)</span>
-<span id="L438" class="LineNr">438 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L439" class="LineNr">439 </span>    68/push  <span class="Constant">&quot;ab&quot;</span>/imm32
-<span id="L440" class="LineNr">440 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L441" class="LineNr">441 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L442" class="LineNr">442 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
-<span id="L443" class="LineNr">443 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L444" class="LineNr">444 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L445" class="LineNr">445 </span>    <span class="subxComment"># skip-chars-matching(_test-stream, 0x20/space)</span>
-<span id="L446" class="LineNr">446 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L447" class="LineNr">447 </span>    68/push  0x20/imm32
-<span id="L448" class="LineNr">448 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L449" class="LineNr">449 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L450" class="LineNr">450 </span>    e8/call  <a href='073next-token.subx.html#L346'>skip-chars-matching</a>/disp32
-<span id="L451" class="LineNr">451 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L452" class="LineNr">452 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L453" class="LineNr">453 </span>    <span class="subxComment"># check-ints-equal(_test-stream-&gt;read, 0, msg)</span>
-<span id="L454" class="LineNr">454 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L455" class="LineNr">455 </span>    68/push  <span class="Constant">&quot;F - test-skip-chars-matching-none&quot;</span>/imm32
-<span id="L456" class="LineNr">456 </span>    68/push  0/imm32
-<span id="L457" class="LineNr">457 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;read</span>
-<span id="L458" class="LineNr">458 </span>    b8/copy-to-EAX  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L459" class="LineNr">459 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+4)</span>
-<span id="L460" class="LineNr">460 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L461" class="LineNr">461 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L462" class="LineNr">462 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L463" class="LineNr">463 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L464" class="LineNr">464 </span>    <span class="subxComment"># end</span>
-<span id="L465" class="LineNr">465 </span>    c3/return
-<span id="L466" class="LineNr">466 </span>
-<span id="L467" class="LineNr">467 </span><span class="subxComment"># minor fork of 'skip-chars-matching'</span>
-<span id="L468" class="LineNr">468 </span><span class="subxFunction">skip-chars-not-matching</span>:  <span class="subxComment"># in : (address stream), delimiter : byte</span>
-<span id="L469" class="LineNr">469 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L470" class="LineNr">470 </span>    55/push-EBP
-<span id="L471" class="LineNr">471 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L472" class="LineNr">472 </span>    <span class="subxS1Comment"># . save registers</span>
-<span id="L473" class="LineNr">473 </span>    50/push-EAX
-<span id="L474" class="LineNr">474 </span>    51/push-ECX
-<span id="L475" class="LineNr">475 </span>    52/push-EDX
-<span id="L476" class="LineNr">476 </span>    56/push-ESI
-<span id="L477" class="LineNr">477 </span>    <span class="subxComment"># ESI = in</span>
-<span id="L478" class="LineNr">478 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
-<span id="L479" class="LineNr">479 </span>    <span class="subxComment"># ECX = in-&gt;read</span>
-<span id="L480" class="LineNr">480 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESI+4) to ECX</span>
-<span id="L481" class="LineNr">481 </span>    <span class="subxComment"># EBX = in-&gt;write</span>
-<span id="L482" class="LineNr">482 </span>    8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ESI to EBX</span>
-<span id="L483" class="LineNr">483 </span>    <span class="subxComment"># EDX = delimiter</span>
-<span id="L484" class="LineNr">484 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDX</span>
-<span id="L485" class="LineNr">485 </span><span class="Constant">$skip-chars-not-matching:loop</span>:
-<span id="L486" class="LineNr">486 </span>    <span class="subxComment"># if (in-&gt;read &gt;= in-&gt;write) break</span>
-<span id="L487" class="LineNr">487 </span>    39/compare                      3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare ECX with EBX</span>
-<span id="L488" class="LineNr">488 </span>    7d/jump-if-greater-or-equal  $skip-chars-not-matching:end/disp8
-<span id="L489" class="LineNr">489 </span>    <span class="subxComment"># EAX = in-&gt;data[in-&gt;read]</span>
-<span id="L490" class="LineNr">490 </span>    31/xor                          3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EAX</span>
-<span id="L491" class="LineNr">491 </span>    8a/copy-byte                    1/mod/*+disp8   4/rm32/sib    6/base/ESI  1/index/ECX  <span class="Normal"> . </span>          0/r32/AL    0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *(ESI+ECX+12) to AL</span>
-<span id="L492" class="LineNr">492 </span>    <span class="subxComment"># if (EAX == delimiter) break</span>
-<span id="L493" class="LineNr">493 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX and EDX</span>
-<span id="L494" class="LineNr">494 </span>    74/jump-if-equal  $skip-chars-not-matching:end/disp8
-<span id="L495" class="LineNr">495 </span>    <span class="subxComment"># ++in-&gt;read</span>
-<span id="L496" class="LineNr">496 </span>    41/inc-ECX
-<span id="L497" class="LineNr">497 </span>    eb/jump  $skip-chars-not-matching:loop/disp8
-<span id="L498" class="LineNr">498 </span><span class="Constant">$skip-chars-not-matching:end</span>:
-<span id="L499" class="LineNr">499 </span>    <span class="subxComment"># persist in-&gt;read</span>
-<span id="L500" class="LineNr">500 </span>    89/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy ECX to *(ESI+4)</span>
-<span id="L501" class="LineNr">501 </span>    <span class="subxS1Comment"># . restore registers</span>
-<span id="L502" class="LineNr">502 </span>    5e/pop-to-ESI
-<span id="L503" class="LineNr">503 </span>    5a/pop-to-EDX
-<span id="L504" class="LineNr">504 </span>    59/pop-to-ECX
-<span id="L505" class="LineNr">505 </span>    58/pop-to-EAX
-<span id="L506" class="LineNr">506 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L507" class="LineNr">507 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L508" class="LineNr">508 </span>    5d/pop-to-EBP
-<span id="L509" class="LineNr">509 </span>    c3/return
-<span id="L510" class="LineNr">510 </span>
-<span id="L511" class="LineNr">511 </span><span class="subxTest">test-skip-chars-not-matching</span>:
-<span id="L512" class="LineNr">512 </span>    <span class="subxComment"># setup</span>
-<span id="L513" class="LineNr">513 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
-<span id="L514" class="LineNr">514 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L515" class="LineNr">515 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L516" class="LineNr">516 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L517" class="LineNr">517 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L518" class="LineNr">518 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L519" class="LineNr">519 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L520" class="LineNr">520 </span>    <span class="subxComment"># write(_test-stream, &quot;ab &quot;)</span>
-<span id="L521" class="LineNr">521 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L522" class="LineNr">522 </span>    68/push  <span class="Constant">&quot;ab &quot;</span>/imm32
-<span id="L523" class="LineNr">523 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L524" class="LineNr">524 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L525" class="LineNr">525 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
-<span id="L526" class="LineNr">526 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L527" class="LineNr">527 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L528" class="LineNr">528 </span>    <span class="subxComment"># skip-chars-not-matching(_test-stream, 0x20/space)</span>
-<span id="L529" class="LineNr">529 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L530" class="LineNr">530 </span>    68/push  0x20/imm32
-<span id="L531" class="LineNr">531 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L532" class="LineNr">532 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L533" class="LineNr">533 </span>    e8/call  <a href='073next-token.subx.html#L468'>skip-chars-not-matching</a>/disp32
-<span id="L534" class="LineNr">534 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L535" class="LineNr">535 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L536" class="LineNr">536 </span>    <span class="subxComment"># check-ints-equal(_test-stream-&gt;read, 2, msg)</span>
-<span id="L537" class="LineNr">537 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L538" class="LineNr">538 </span>    68/push  <span class="Constant">&quot;F - test-skip-chars-not-matching&quot;</span>/imm32
-<span id="L539" class="LineNr">539 </span>    68/push  2/imm32
-<span id="L540" class="LineNr">540 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;read</span>
-<span id="L541" class="LineNr">541 </span>    b8/copy-to-EAX  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L542" class="LineNr">542 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+4)</span>
-<span id="L543" class="LineNr">543 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L544" class="LineNr">544 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L545" class="LineNr">545 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L546" class="LineNr">546 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L547" class="LineNr">547 </span>    <span class="subxComment"># end</span>
-<span id="L548" class="LineNr">548 </span>    c3/return
-<span id="L549" class="LineNr">549 </span>
-<span id="L550" class="LineNr">550 </span><span class="subxTest">test-skip-chars-not-matching-none</span>:
-<span id="L551" class="LineNr">551 </span>    <span class="subxComment"># setup</span>
-<span id="L552" class="LineNr">552 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
-<span id="L553" class="LineNr">553 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L554" class="LineNr">554 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L555" class="LineNr">555 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L556" class="LineNr">556 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L557" class="LineNr">557 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L558" class="LineNr">558 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L559" class="LineNr">559 </span>    <span class="subxComment"># write(_test-stream, &quot; ab&quot;)</span>
-<span id="L560" class="LineNr">560 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L561" class="LineNr">561 </span>    68/push  <span class="Constant">&quot; ab&quot;</span>/imm32
-<span id="L562" class="LineNr">562 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L563" class="LineNr">563 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L564" class="LineNr">564 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
-<span id="L565" class="LineNr">565 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L566" class="LineNr">566 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L567" class="LineNr">567 </span>    <span class="subxComment"># skip-chars-not-matching(_test-stream, 0x20/space)</span>
-<span id="L568" class="LineNr">568 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L569" class="LineNr">569 </span>    68/push  0x20/imm32
-<span id="L570" class="LineNr">570 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L571" class="LineNr">571 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L572" class="LineNr">572 </span>    e8/call  <a href='073next-token.subx.html#L468'>skip-chars-not-matching</a>/disp32
-<span id="L573" class="LineNr">573 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L574" class="LineNr">574 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L575" class="LineNr">575 </span>    <span class="subxComment"># check-ints-equal(_test-stream-&gt;read, 0, msg)</span>
-<span id="L576" class="LineNr">576 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L577" class="LineNr">577 </span>    68/push  <span class="Constant">&quot;F - test-skip-chars-not-matching-none&quot;</span>/imm32
-<span id="L578" class="LineNr">578 </span>    68/push  0/imm32
-<span id="L579" class="LineNr">579 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;read</span>
-<span id="L580" class="LineNr">580 </span>    b8/copy-to-EAX  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L581" class="LineNr">581 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+4)</span>
-<span id="L582" class="LineNr">582 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L583" class="LineNr">583 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L584" class="LineNr">584 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L585" class="LineNr">585 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L586" class="LineNr">586 </span>    <span class="subxComment"># end</span>
-<span id="L587" class="LineNr">587 </span>    c3/return
-<span id="L588" class="LineNr">588 </span>
-<span id="L589" class="LineNr">589 </span><span class="subxTest">test-skip-chars-not-matching-all</span>:
-<span id="L590" class="LineNr">590 </span>    <span class="subxComment"># setup</span>
-<span id="L591" class="LineNr">591 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
-<span id="L592" class="LineNr">592 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L593" class="LineNr">593 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L594" class="LineNr">594 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L595" class="LineNr">595 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L596" class="LineNr">596 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L597" class="LineNr">597 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L598" class="LineNr">598 </span>    <span class="subxComment"># write(_test-stream, &quot;ab&quot;)</span>
-<span id="L599" class="LineNr">599 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L600" class="LineNr">600 </span>    68/push  <span class="Constant">&quot;ab&quot;</span>/imm32
-<span id="L601" class="LineNr">601 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L602" class="LineNr">602 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L603" class="LineNr">603 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
-<span id="L604" class="LineNr">604 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L605" class="LineNr">605 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L606" class="LineNr">606 </span>    <span class="subxComment"># skip-chars-not-matching(_test-stream, 0x20/space)</span>
-<span id="L607" class="LineNr">607 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L608" class="LineNr">608 </span>    68/push  0x20/imm32
-<span id="L609" class="LineNr">609 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L610" class="LineNr">610 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L611" class="LineNr">611 </span>    e8/call  <a href='073next-token.subx.html#L468'>skip-chars-not-matching</a>/disp32
-<span id="L612" class="LineNr">612 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L613" class="LineNr">613 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L614" class="LineNr">614 </span>    <span class="subxComment"># check-ints-equal(_test-stream-&gt;read, 2, msg)</span>
-<span id="L615" class="LineNr">615 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L616" class="LineNr">616 </span>    68/push  <span class="Constant">&quot;F - test-skip-chars-not-matching-all&quot;</span>/imm32
-<span id="L617" class="LineNr">617 </span>    68/push  2/imm32
-<span id="L618" class="LineNr">618 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;read</span>
-<span id="L619" class="LineNr">619 </span>    b8/copy-to-EAX  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L620" class="LineNr">620 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+4)</span>
-<span id="L621" class="LineNr">621 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L622" class="LineNr">622 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L623" class="LineNr">623 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L624" class="LineNr">624 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L625" class="LineNr">625 </span>    <span class="subxComment"># end</span>
-<span id="L626" class="LineNr">626 </span>    c3/return
-<span id="L627" class="LineNr">627 </span>
-<span id="L628" class="LineNr">628 </span><span class="subxFunction">skip-chars-matching-in-slice</span>:  <span class="subxComment"># curr : (address byte), end : (address byte), delimiter : byte -&gt; curr/EAX</span>
-<span id="L629" class="LineNr">629 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L630" class="LineNr">630 </span>    55/push-EBP
-<span id="L631" class="LineNr">631 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L632" class="LineNr">632 </span>    <span class="subxS1Comment"># . save registers</span>
-<span id="L633" class="LineNr">633 </span>    51/push-ECX
-<span id="L634" class="LineNr">634 </span>    52/push-EDX
-<span id="L635" class="LineNr">635 </span>    53/push-EBX
-<span id="L636" class="LineNr">636 </span>    <span class="subxComment"># EAX = curr</span>
-<span id="L637" class="LineNr">637 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
-<span id="L638" class="LineNr">638 </span>    <span class="subxComment"># ECX = end</span>
-<span id="L639" class="LineNr">639 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to ECX</span>
-<span id="L640" class="LineNr">640 </span>    <span class="subxComment"># EDX = delimiter</span>
-<span id="L641" class="LineNr">641 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   0x10/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+16) to EDX</span>
-<span id="L642" class="LineNr">642 </span>    <span class="subxComment"># EBX = 0</span>
-<span id="L643" class="LineNr">643 </span>    31/xor                          3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EBX</span>
-<span id="L644" class="LineNr">644 </span><span class="Constant">$skip-chars-matching-in-slice:loop</span>:
-<span id="L645" class="LineNr">645 </span>    <span class="subxComment"># if (curr &gt;= end) break</span>
-<span id="L646" class="LineNr">646 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX with ECX</span>
-<span id="L647" class="LineNr">647 </span>    7d/jump-if-greater-or-equal  $skip-chars-matching-in-slice:end/disp8
-<span id="L648" class="LineNr">648 </span>    <span class="subxComment"># if (*curr != delimiter) break</span>
-<span id="L649" class="LineNr">649 </span>    8a/copy-byte                    0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/BL   <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *EAX to BL</span>
-<span id="L650" class="LineNr">650 </span>    39/compare                      3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EBX and EDX</span>
-<span id="L651" class="LineNr">651 </span>    75/jump-if-not-equal  $skip-chars-matching-in-slice:end/disp8
-<span id="L652" class="LineNr">652 </span>    <span class="subxComment"># ++in-&gt;read</span>
-<span id="L653" class="LineNr">653 </span>    40/inc-EAX
-<span id="L654" class="LineNr">654 </span>    eb/jump  $skip-chars-matching-in-slice:loop/disp8
-<span id="L655" class="LineNr">655 </span><span class="Constant">$skip-chars-matching-in-slice:end</span>:
-<span id="L656" class="LineNr">656 </span>    <span class="subxS1Comment"># . restore registers</span>
-<span id="L657" class="LineNr">657 </span>    5b/pop-to-EBX
-<span id="L658" class="LineNr">658 </span>    5a/pop-to-EDX
-<span id="L659" class="LineNr">659 </span>    59/pop-to-ECX
-<span id="L660" class="LineNr">660 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L661" class="LineNr">661 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L662" class="LineNr">662 </span>    5d/pop-to-EBP
-<span id="L663" class="LineNr">663 </span>    c3/return
-<span id="L664" class="LineNr">664 </span>
-<span id="L665" class="LineNr">665 </span><span class="subxTest">test-skip-chars-matching-in-slice</span>:
-<span id="L666" class="LineNr">666 </span>    <span class="subxComment"># (EAX..ECX) = &quot;  ab&quot;</span>
-<span id="L667" class="LineNr">667 </span>    b8/copy-to-EAX  <span class="Constant">&quot;  ab&quot;</span>/imm32
-<span id="L668" class="LineNr">668 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EAX to ECX</span>
-<span id="L669" class="LineNr">669 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX+ECX+4 to ECX</span>
-<span id="L670" class="LineNr">670 </span>    05/add-to-EAX  4/imm32
-<span id="L671" class="LineNr">671 </span>    <span class="subxComment"># EAX = skip-chars-matching-in-slice(EAX, ECX, 0x20/space)</span>
-<span id="L672" class="LineNr">672 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L673" class="LineNr">673 </span>    68/push  0x20/imm32
-<span id="L674" class="LineNr">674 </span>    51/push-ECX
-<span id="L675" class="LineNr">675 </span>    50/push-EAX
-<span id="L676" class="LineNr">676 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L677" class="LineNr">677 </span>    e8/call  <a href='073next-token.subx.html#L628'>skip-chars-matching-in-slice</a>/disp32
-<span id="L678" class="LineNr">678 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L679" class="LineNr">679 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L680" class="LineNr">680 </span>    <span class="subxComment"># check-ints-equal(ECX-EAX, 2, msg)</span>
-<span id="L681" class="LineNr">681 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L682" class="LineNr">682 </span>    68/push  <span class="Constant">&quot;F - test-skip-chars-matching-in-slice&quot;</span>/imm32
-<span id="L683" class="LineNr">683 </span>    68/push  2/imm32
-<span id="L684" class="LineNr">684 </span>    <span class="subxS2Comment"># . . push ECX-EAX</span>
-<span id="L685" class="LineNr">685 </span>    29/subtract                     3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># subtract EAX from ECX</span>
-<span id="L686" class="LineNr">686 </span>    51/push-ECX
-<span id="L687" class="LineNr">687 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L688" class="LineNr">688 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L689" class="LineNr">689 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L690" class="LineNr">690 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L691" class="LineNr">691 </span>    <span class="subxComment"># end</span>
-<span id="L692" class="LineNr">692 </span>    c3/return
-<span id="L693" class="LineNr">693 </span>
-<span id="L694" class="LineNr">694 </span><span class="subxTest">test-skip-chars-matching-in-slice-none</span>:
-<span id="L695" class="LineNr">695 </span>    <span class="subxComment"># (EAX..ECX) = &quot;ab&quot;</span>
-<span id="L696" class="LineNr">696 </span>    b8/copy-to-EAX  <span class="Constant">&quot;ab&quot;</span>/imm32
-<span id="L697" class="LineNr">697 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EAX to ECX</span>
-<span id="L698" class="LineNr">698 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX+ECX+4 to ECX</span>
-<span id="L699" class="LineNr">699 </span>    05/add-to-EAX  4/imm32
-<span id="L700" class="LineNr">700 </span>    <span class="subxComment"># EAX = skip-chars-matching-in-slice(EAX, ECX, 0x20/space)</span>
-<span id="L701" class="LineNr">701 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L702" class="LineNr">702 </span>    68/push  0x20/imm32
-<span id="L703" class="LineNr">703 </span>    51/push-ECX
-<span id="L704" class="LineNr">704 </span>    50/push-EAX
-<span id="L705" class="LineNr">705 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L706" class="LineNr">706 </span>    e8/call  <a href='073next-token.subx.html#L628'>skip-chars-matching-in-slice</a>/disp32
-<span id="L707" class="LineNr">707 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L708" class="LineNr">708 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L709" class="LineNr">709 </span>    <span class="subxComment"># check-ints-equal(ECX-EAX, 2, msg)</span>
-<span id="L710" class="LineNr">710 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L711" class="LineNr">711 </span>    68/push  <span class="Constant">&quot;F - test-skip-chars-matching-in-slice-none&quot;</span>/imm32
-<span id="L712" class="LineNr">712 </span>    68/push  2/imm32
-<span id="L713" class="LineNr">713 </span>    <span class="subxS2Comment"># . . push ECX-EAX</span>
-<span id="L714" class="LineNr">714 </span>    29/subtract                     3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># subtract EAX from ECX</span>
-<span id="L715" class="LineNr">715 </span>    51/push-ECX
-<span id="L716" class="LineNr">716 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L717" class="LineNr">717 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L718" class="LineNr">718 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L719" class="LineNr">719 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L720" class="LineNr">720 </span>    <span class="subxComment"># end</span>
-<span id="L721" class="LineNr">721 </span>    c3/return
-<span id="L722" class="LineNr">722 </span>
-<span id="L723" class="LineNr">723 </span><span class="subxComment"># minor fork of 'skip-chars-matching-in-slice'</span>
-<span id="L724" class="LineNr">724 </span><span class="subxFunction">skip-chars-not-matching-in-slice</span>:  <span class="subxComment"># curr : (address byte), end : (address byte), delimiter : byte -&gt; curr/EAX</span>
-<span id="L725" class="LineNr">725 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L726" class="LineNr">726 </span>    55/push-EBP
-<span id="L727" class="LineNr">727 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L728" class="LineNr">728 </span>    <span class="subxS1Comment"># . save registers</span>
-<span id="L729" class="LineNr">729 </span>    51/push-ECX
-<span id="L730" class="LineNr">730 </span>    52/push-EDX
-<span id="L731" class="LineNr">731 </span>    53/push-EBX
-<span id="L732" class="LineNr">732 </span>    <span class="subxComment"># EAX = curr</span>
-<span id="L733" class="LineNr">733 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
-<span id="L734" class="LineNr">734 </span>    <span class="subxComment"># ECX = end</span>
-<span id="L735" class="LineNr">735 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to ECX</span>
-<span id="L736" class="LineNr">736 </span>    <span class="subxComment"># EDX = delimiter</span>
-<span id="L737" class="LineNr">737 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   0x10/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+16) to EDX</span>
-<span id="L738" class="LineNr">738 </span>    <span class="subxComment"># EBX = 0</span>
-<span id="L739" class="LineNr">739 </span>    31/xor                          3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EBX</span>
-<span id="L740" class="LineNr">740 </span><span class="Constant">$skip-chars-not-matching-in-slice:loop</span>:
-<span id="L741" class="LineNr">741 </span>    <span class="subxComment"># if (curr &gt;= end) break</span>
-<span id="L742" class="LineNr">742 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX with ECX</span>
-<span id="L743" class="LineNr">743 </span>    7d/jump-if-greater-or-equal  $skip-chars-not-matching-in-slice:end/disp8
-<span id="L744" class="LineNr">744 </span>    <span class="subxComment"># if (*curr == delimiter) break</span>
-<span id="L745" class="LineNr">745 </span>    8a/copy-byte                    0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/BL   <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *EAX to BL</span>
-<span id="L746" class="LineNr">746 </span>    39/compare                      3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EBX and EDX</span>
-<span id="L747" class="LineNr">747 </span>    74/jump-if-equal  $skip-chars-not-matching-in-slice:end/disp8
-<span id="L748" class="LineNr">748 </span>    <span class="subxComment"># ++in-&gt;read</span>
-<span id="L749" class="LineNr">749 </span>    40/inc-EAX
-<span id="L750" class="LineNr">750 </span>    eb/jump  $skip-chars-not-matching-in-slice:loop/disp8
-<span id="L751" class="LineNr">751 </span><span class="Constant">$skip-chars-not-matching-in-slice:end</span>:
-<span id="L752" class="LineNr">752 </span>    <span class="subxS1Comment"># . restore registers</span>
-<span id="L753" class="LineNr">753 </span>    5b/pop-to-EBX
-<span id="L754" class="LineNr">754 </span>    5a/pop-to-EDX
-<span id="L755" class="LineNr">755 </span>    59/pop-to-ECX
-<span id="L756" class="LineNr">756 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L757" class="LineNr">757 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L758" class="LineNr">758 </span>    5d/pop-to-EBP
-<span id="L759" class="LineNr">759 </span>    c3/return
-<span id="L760" class="LineNr">760 </span>
-<span id="L761" class="LineNr">761 </span><span class="subxTest">test-skip-chars-not-matching-in-slice</span>:
-<span id="L762" class="LineNr">762 </span>    <span class="subxComment"># (EAX..ECX) = &quot;ab &quot;</span>
-<span id="L763" class="LineNr">763 </span>    b8/copy-to-EAX  <span class="Constant">&quot;ab &quot;</span>/imm32
-<span id="L764" class="LineNr">764 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EAX to ECX</span>
-<span id="L765" class="LineNr">765 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX+ECX+4 to ECX</span>
-<span id="L766" class="LineNr">766 </span>    05/add-to-EAX  4/imm32
-<span id="L767" class="LineNr">767 </span>    <span class="subxComment"># EAX = skip-chars-not-matching-in-slice(EAX, ECX, 0x20/space)</span>
-<span id="L768" class="LineNr">768 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L769" class="LineNr">769 </span>    68/push  0x20/imm32
-<span id="L770" class="LineNr">770 </span>    51/push-ECX
-<span id="L771" class="LineNr">771 </span>    50/push-EAX
-<span id="L772" class="LineNr">772 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L773" class="LineNr">773 </span>    e8/call  <a href='073next-token.subx.html#L724'>skip-chars-not-matching-in-slice</a>/disp32
-<span id="L774" class="LineNr">774 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L775" class="LineNr">775 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L776" class="LineNr">776 </span>    <span class="subxComment"># check-ints-equal(ECX-EAX, 1, msg)</span>
-<span id="L777" class="LineNr">777 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L778" class="LineNr">778 </span>    68/push  <span class="Constant">&quot;F - test-skip-chars-not-matching-in-slice&quot;</span>/imm32
-<span id="L779" class="LineNr">779 </span>    68/push  1/imm32
-<span id="L780" class="LineNr">780 </span>    <span class="subxS2Comment"># . . push ECX-EAX</span>
-<span id="L781" class="LineNr">781 </span>    29/subtract                     3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># subtract EAX from ECX</span>
-<span id="L782" class="LineNr">782 </span>    51/push-ECX
-<span id="L783" class="LineNr">783 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L784" class="LineNr">784 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L785" class="LineNr">785 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L786" class="LineNr">786 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L787" class="LineNr">787 </span>    <span class="subxComment"># end</span>
-<span id="L788" class="LineNr">788 </span>    c3/return
-<span id="L789" class="LineNr">789 </span>
-<span id="L790" class="LineNr">790 </span><span class="subxTest">test-skip-chars-not-matching-in-slice-none</span>:
-<span id="L791" class="LineNr">791 </span>    <span class="subxComment"># (EAX..ECX) = &quot; ab&quot;</span>
-<span id="L792" class="LineNr">792 </span>    b8/copy-to-EAX  <span class="Constant">&quot; ab&quot;</span>/imm32
-<span id="L793" class="LineNr">793 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EAX to ECX</span>
-<span id="L794" class="LineNr">794 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX+ECX+4 to ECX</span>
-<span id="L795" class="LineNr">795 </span>    05/add-to-EAX  4/imm32
-<span id="L796" class="LineNr">796 </span>    <span class="subxComment"># EAX = skip-chars-not-matching-in-slice(EAX, ECX, 0x20/space)</span>
-<span id="L797" class="LineNr">797 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L798" class="LineNr">798 </span>    68/push  0x20/imm32
-<span id="L799" class="LineNr">799 </span>    51/push-ECX
-<span id="L800" class="LineNr">800 </span>    50/push-EAX
-<span id="L801" class="LineNr">801 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L802" class="LineNr">802 </span>    e8/call  <a href='073next-token.subx.html#L724'>skip-chars-not-matching-in-slice</a>/disp32
-<span id="L803" class="LineNr">803 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L804" class="LineNr">804 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L805" class="LineNr">805 </span>    <span class="subxComment"># check-ints-equal(ECX-EAX, 3, msg)</span>
-<span id="L806" class="LineNr">806 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L807" class="LineNr">807 </span>    68/push  <span class="Constant">&quot;F - test-skip-chars-not-matching-in-slice-none&quot;</span>/imm32
-<span id="L808" class="LineNr">808 </span>    68/push  3/imm32
-<span id="L809" class="LineNr">809 </span>    <span class="subxS2Comment"># . . push ECX-EAX</span>
-<span id="L810" class="LineNr">810 </span>    29/subtract                     3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># subtract EAX from ECX</span>
-<span id="L811" class="LineNr">811 </span>    51/push-ECX
-<span id="L812" class="LineNr">812 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L813" class="LineNr">813 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L814" class="LineNr">814 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L815" class="LineNr">815 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L816" class="LineNr">816 </span>    <span class="subxComment"># end</span>
-<span id="L817" class="LineNr">817 </span>    c3/return
-<span id="L818" class="LineNr">818 </span>
-<span id="L819" class="LineNr">819 </span><span class="subxTest">test-skip-chars-not-matching-in-slice-all</span>:
-<span id="L820" class="LineNr">820 </span>    <span class="subxComment"># (EAX..ECX) = &quot;ab&quot;</span>
-<span id="L821" class="LineNr">821 </span>    b8/copy-to-EAX  <span class="Constant">&quot;ab&quot;</span>/imm32
-<span id="L822" class="LineNr">822 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EAX to ECX</span>
-<span id="L823" class="LineNr">823 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX+ECX+4 to ECX</span>
-<span id="L824" class="LineNr">824 </span>    05/add-to-EAX  4/imm32
-<span id="L825" class="LineNr">825 </span>    <span class="subxComment"># EAX = skip-chars-not-matching-in-slice(EAX, ECX, 0x20/space)</span>
-<span id="L826" class="LineNr">826 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L827" class="LineNr">827 </span>    68/push  0x20/imm32
-<span id="L828" class="LineNr">828 </span>    51/push-ECX
-<span id="L829" class="LineNr">829 </span>    50/push-EAX
-<span id="L830" class="LineNr">830 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L831" class="LineNr">831 </span>    e8/call  <a href='073next-token.subx.html#L724'>skip-chars-not-matching-in-slice</a>/disp32
-<span id="L832" class="LineNr">832 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L833" class="LineNr">833 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L834" class="LineNr">834 </span>    <span class="subxComment"># check-ints-equal(ECX-EAX, 0, msg)</span>
-<span id="L835" class="LineNr">835 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L836" class="LineNr">836 </span>    68/push  <span class="Constant">&quot;F - test-skip-chars-not-matching-in-slice-all&quot;</span>/imm32
-<span id="L837" class="LineNr">837 </span>    68/push  0/imm32
-<span id="L838" class="LineNr">838 </span>    <span class="subxS2Comment"># . . push ECX-EAX</span>
-<span id="L839" class="LineNr">839 </span>    29/subtract                     3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># subtract EAX from ECX</span>
-<span id="L840" class="LineNr">840 </span>    51/push-ECX
-<span id="L841" class="LineNr">841 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L842" class="LineNr">842 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L843" class="LineNr">843 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L844" class="LineNr">844 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L845" class="LineNr">845 </span>    <span class="subxComment"># end</span>
-<span id="L846" class="LineNr">846 </span>    c3/return
-<span id="L847" class="LineNr">847 </span>
-<span id="L848" class="LineNr">848 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
+<span id="L354" class="LineNr">354 </span>    53/push-EBX
+<span id="L355" class="LineNr">355 </span>    56/push-ESI
+<span id="L356" class="LineNr">356 </span>    <span class="subxComment"># ESI = in</span>
+<span id="L357" class="LineNr">357 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
+<span id="L358" class="LineNr">358 </span>    <span class="subxComment"># ECX = in-&gt;read</span>
+<span id="L359" class="LineNr">359 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESI+4) to ECX</span>
+<span id="L360" class="LineNr">360 </span>    <span class="subxComment"># EBX = in-&gt;write</span>
+<span id="L361" class="LineNr">361 </span>    8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ESI to EBX</span>
+<span id="L362" class="LineNr">362 </span>    <span class="subxComment"># EDX = delimiter</span>
+<span id="L363" class="LineNr">363 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDX</span>
+<span id="L364" class="LineNr">364 </span><span class="Constant">$skip-chars-matching:loop</span>:
+<span id="L365" class="LineNr">365 </span>    <span class="subxComment"># if (in-&gt;read &gt;= in-&gt;write) break</span>
+<span id="L366" class="LineNr">366 </span>    39/compare                      3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare ECX with EBX</span>
+<span id="L367" class="LineNr">367 </span>    7d/jump-if-greater-or-equal  $skip-chars-matching:end/disp8
+<span id="L368" class="LineNr">368 </span>    <span class="subxComment"># EAX = in-&gt;data[in-&gt;read]</span>
+<span id="L369" class="LineNr">369 </span>    31/xor                          3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EAX</span>
+<span id="L370" class="LineNr">370 </span>    8a/copy-byte                    1/mod/*+disp8   4/rm32/sib    6/base/ESI  1/index/ECX  <span class="Normal"> . </span>          0/r32/AL    0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *(ESI+ECX+12) to AL</span>
+<span id="L371" class="LineNr">371 </span>    <span class="subxComment"># if (EAX != delimiter) break</span>
+<span id="L372" class="LineNr">372 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX and EDX</span>
+<span id="L373" class="LineNr">373 </span>    75/jump-if-not-equal  $skip-chars-matching:end/disp8
+<span id="L374" class="LineNr">374 </span>    <span class="subxComment"># ++in-&gt;read</span>
+<span id="L375" class="LineNr">375 </span>    41/inc-ECX
+<span id="L376" class="LineNr">376 </span>    eb/jump  $skip-chars-matching:loop/disp8
+<span id="L377" class="LineNr">377 </span><span class="Constant">$skip-chars-matching:end</span>:
+<span id="L378" class="LineNr">378 </span>    <span class="subxComment"># persist in-&gt;read</span>
+<span id="L379" class="LineNr">379 </span>    89/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy ECX to *(ESI+4)</span>
+<span id="L380" class="LineNr">380 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L381" class="LineNr">381 </span>    5e/pop-to-ESI
+<span id="L382" class="LineNr">382 </span>    5b/pop-to-EBX
+<span id="L383" class="LineNr">383 </span>    5a/pop-to-EDX
+<span id="L384" class="LineNr">384 </span>    59/pop-to-ECX
+<span id="L385" class="LineNr">385 </span>    58/pop-to-EAX
+<span id="L386" class="LineNr">386 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L387" class="LineNr">387 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L388" class="LineNr">388 </span>    5d/pop-to-EBP
+<span id="L389" class="LineNr">389 </span>    c3/return
+<span id="L390" class="LineNr">390 </span>
+<span id="L391" class="LineNr">391 </span><span class="subxTest">test-skip-chars-matching</span>:
+<span id="L392" class="LineNr">392 </span>    <span class="subxComment"># setup</span>
+<span id="L393" class="LineNr">393 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L394" class="LineNr">394 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L395" class="LineNr">395 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L396" class="LineNr">396 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L397" class="LineNr">397 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L398" class="LineNr">398 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L399" class="LineNr">399 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L400" class="LineNr">400 </span>    <span class="subxComment"># write(_test-stream, &quot;  ab&quot;)</span>
+<span id="L401" class="LineNr">401 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L402" class="LineNr">402 </span>    68/push  <span class="Constant">&quot;  ab&quot;</span>/imm32
+<span id="L403" class="LineNr">403 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L404" class="LineNr">404 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L405" class="LineNr">405 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
+<span id="L406" class="LineNr">406 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L407" class="LineNr">407 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L408" class="LineNr">408 </span>    <span class="subxComment"># skip-chars-matching(_test-stream, 0x20/space)</span>
+<span id="L409" class="LineNr">409 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L410" class="LineNr">410 </span>    68/push  0x20/imm32
+<span id="L411" class="LineNr">411 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L412" class="LineNr">412 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L413" class="LineNr">413 </span>    e8/call  <a href='073next-token.subx.html#L346'>skip-chars-matching</a>/disp32
+<span id="L414" class="LineNr">414 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L415" class="LineNr">415 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L416" class="LineNr">416 </span>    <span class="subxComment"># check-ints-equal(_test-stream-&gt;read, 2, msg)</span>
+<span id="L417" class="LineNr">417 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L418" class="LineNr">418 </span>    68/push  <span class="Constant">&quot;F - test-skip-chars-matching&quot;</span>/imm32
+<span id="L419" class="LineNr">419 </span>    68/push  2/imm32
+<span id="L420" class="LineNr">420 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;read</span>
+<span id="L421" class="LineNr">421 </span>    b8/copy-to-EAX  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L422" class="LineNr">422 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+4)</span>
+<span id="L423" class="LineNr">423 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L424" class="LineNr">424 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L425" class="LineNr">425 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L426" class="LineNr">426 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L427" class="LineNr">427 </span>    <span class="subxComment"># end</span>
+<span id="L428" class="LineNr">428 </span>    c3/return
+<span id="L429" class="LineNr">429 </span>
+<span id="L430" class="LineNr">430 </span><span class="subxTest">test-skip-chars-matching-none</span>:
+<span id="L431" class="LineNr">431 </span>    <span class="subxComment"># setup</span>
+<span id="L432" class="LineNr">432 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L433" class="LineNr">433 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L434" class="LineNr">434 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L435" class="LineNr">435 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L436" class="LineNr">436 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L437" class="LineNr">437 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L438" class="LineNr">438 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L439" class="LineNr">439 </span>    <span class="subxComment"># write(_test-stream, &quot;ab&quot;)</span>
+<span id="L440" class="LineNr">440 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L441" class="LineNr">441 </span>    68/push  <span class="Constant">&quot;ab&quot;</span>/imm32
+<span id="L442" class="LineNr">442 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L443" class="LineNr">443 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L444" class="LineNr">444 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
+<span id="L445" class="LineNr">445 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L446" class="LineNr">446 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L447" class="LineNr">447 </span>    <span class="subxComment"># skip-chars-matching(_test-stream, 0x20/space)</span>
+<span id="L448" class="LineNr">448 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L449" class="LineNr">449 </span>    68/push  0x20/imm32
+<span id="L450" class="LineNr">450 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L451" class="LineNr">451 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L452" class="LineNr">452 </span>    e8/call  <a href='073next-token.subx.html#L346'>skip-chars-matching</a>/disp32
+<span id="L453" class="LineNr">453 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L454" class="LineNr">454 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L455" class="LineNr">455 </span>    <span class="subxComment"># check-ints-equal(_test-stream-&gt;read, 0, msg)</span>
+<span id="L456" class="LineNr">456 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L457" class="LineNr">457 </span>    68/push  <span class="Constant">&quot;F - test-skip-chars-matching-none&quot;</span>/imm32
+<span id="L458" class="LineNr">458 </span>    68/push  0/imm32
+<span id="L459" class="LineNr">459 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;read</span>
+<span id="L460" class="LineNr">460 </span>    b8/copy-to-EAX  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L461" class="LineNr">461 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+4)</span>
+<span id="L462" class="LineNr">462 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L463" class="LineNr">463 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L464" class="LineNr">464 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L465" class="LineNr">465 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L466" class="LineNr">466 </span>    <span class="subxComment"># end</span>
+<span id="L467" class="LineNr">467 </span>    c3/return
+<span id="L468" class="LineNr">468 </span>
+<span id="L469" class="LineNr">469 </span><span class="subxComment"># minor fork of 'skip-chars-matching'</span>
+<span id="L470" class="LineNr">470 </span><span class="subxFunction">skip-chars-not-matching</span>:  <span class="subxComment"># in : (address stream), delimiter : byte</span>
+<span id="L471" class="LineNr">471 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L472" class="LineNr">472 </span>    55/push-EBP
+<span id="L473" class="LineNr">473 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L474" class="LineNr">474 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L475" class="LineNr">475 </span>    50/push-EAX
+<span id="L476" class="LineNr">476 </span>    51/push-ECX
+<span id="L477" class="LineNr">477 </span>    52/push-EDX
+<span id="L478" class="LineNr">478 </span>    53/push-EBX
+<span id="L479" class="LineNr">479 </span>    56/push-ESI
+<span id="L480" class="LineNr">480 </span>    <span class="subxComment"># ESI = in</span>
+<span id="L481" class="LineNr">481 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
+<span id="L482" class="LineNr">482 </span>    <span class="subxComment"># ECX = in-&gt;read</span>
+<span id="L483" class="LineNr">483 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESI+4) to ECX</span>
+<span id="L484" class="LineNr">484 </span>    <span class="subxComment"># EBX = in-&gt;write</span>
+<span id="L485" class="LineNr">485 </span>    8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ESI to EBX</span>
+<span id="L486" class="LineNr">486 </span>    <span class="subxComment"># EDX = delimiter</span>
+<span id="L487" class="LineNr">487 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDX</span>
+<span id="L488" class="LineNr">488 </span><span class="Constant">$skip-chars-not-matching:loop</span>:
+<span id="L489" class="LineNr">489 </span>    <span class="subxComment"># if (in-&gt;read &gt;= in-&gt;write) break</span>
+<span id="L490" class="LineNr">490 </span>    39/compare                      3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare ECX with EBX</span>
+<span id="L491" class="LineNr">491 </span>    7d/jump-if-greater-or-equal  $skip-chars-not-matching:end/disp8
+<span id="L492" class="LineNr">492 </span>    <span class="subxComment"># EAX = in-&gt;data[in-&gt;read]</span>
+<span id="L493" class="LineNr">493 </span>    31/xor                          3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EAX</span>
+<span id="L494" class="LineNr">494 </span>    8a/copy-byte                    1/mod/*+disp8   4/rm32/sib    6/base/ESI  1/index/ECX  <span class="Normal"> . </span>          0/r32/AL    0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *(ESI+ECX+12) to AL</span>
+<span id="L495" class="LineNr">495 </span>    <span class="subxComment"># if (EAX == delimiter) break</span>
+<span id="L496" class="LineNr">496 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX and EDX</span>
+<span id="L497" class="LineNr">497 </span>    74/jump-if-equal  $skip-chars-not-matching:end/disp8
+<span id="L498" class="LineNr">498 </span>    <span class="subxComment"># ++in-&gt;read</span>
+<span id="L499" class="LineNr">499 </span>    41/inc-ECX
+<span id="L500" class="LineNr">500 </span>    eb/jump  $skip-chars-not-matching:loop/disp8
+<span id="L501" class="LineNr">501 </span><span class="Constant">$skip-chars-not-matching:end</span>:
+<span id="L502" class="LineNr">502 </span>    <span class="subxComment"># persist in-&gt;read</span>
+<span id="L503" class="LineNr">503 </span>    89/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy ECX to *(ESI+4)</span>
+<span id="L504" class="LineNr">504 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L505" class="LineNr">505 </span>    5e/pop-to-ESI
+<span id="L506" class="LineNr">506 </span>    5b/pop-to-EBX
+<span id="L507" class="LineNr">507 </span>    5a/pop-to-EDX
+<span id="L508" class="LineNr">508 </span>    59/pop-to-ECX
+<span id="L509" class="LineNr">509 </span>    58/pop-to-EAX
+<span id="L510" class="LineNr">510 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L511" class="LineNr">511 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L512" class="LineNr">512 </span>    5d/pop-to-EBP
+<span id="L513" class="LineNr">513 </span>    c3/return
+<span id="L514" class="LineNr">514 </span>
+<span id="L515" class="LineNr">515 </span><span class="subxTest">test-skip-chars-not-matching</span>:
+<span id="L516" class="LineNr">516 </span>    <span class="subxComment"># setup</span>
+<span id="L517" class="LineNr">517 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L518" class="LineNr">518 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L519" class="LineNr">519 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L520" class="LineNr">520 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L521" class="LineNr">521 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L522" class="LineNr">522 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L523" class="LineNr">523 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L524" class="LineNr">524 </span>    <span class="subxComment"># write(_test-stream, &quot;ab &quot;)</span>
+<span id="L525" class="LineNr">525 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L526" class="LineNr">526 </span>    68/push  <span class="Constant">&quot;ab &quot;</span>/imm32
+<span id="L527" class="LineNr">527 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L528" class="LineNr">528 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L529" class="LineNr">529 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
+<span id="L530" class="LineNr">530 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L531" class="LineNr">531 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L532" class="LineNr">532 </span>    <span class="subxComment"># skip-chars-not-matching(_test-stream, 0x20/space)</span>
+<span id="L533" class="LineNr">533 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L534" class="LineNr">534 </span>    68/push  0x20/imm32
+<span id="L535" class="LineNr">535 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L536" class="LineNr">536 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L537" class="LineNr">537 </span>    e8/call  <a href='073next-token.subx.html#L470'>skip-chars-not-matching</a>/disp32
+<span id="L538" class="LineNr">538 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L539" class="LineNr">539 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L540" class="LineNr">540 </span>    <span class="subxComment"># check-ints-equal(_test-stream-&gt;read, 2, msg)</span>
+<span id="L541" class="LineNr">541 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L542" class="LineNr">542 </span>    68/push  <span class="Constant">&quot;F - test-skip-chars-not-matching&quot;</span>/imm32
+<span id="L543" class="LineNr">543 </span>    68/push  2/imm32
+<span id="L544" class="LineNr">544 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;read</span>
+<span id="L545" class="LineNr">545 </span>    b8/copy-to-EAX  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L546" class="LineNr">546 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+4)</span>
+<span id="L547" class="LineNr">547 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L548" class="LineNr">548 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L549" class="LineNr">549 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L550" class="LineNr">550 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L551" class="LineNr">551 </span>    <span class="subxComment"># end</span>
+<span id="L552" class="LineNr">552 </span>    c3/return
+<span id="L553" class="LineNr">553 </span>
+<span id="L554" class="LineNr">554 </span><span class="subxTest">test-skip-chars-not-matching-none</span>:
+<span id="L555" class="LineNr">555 </span>    <span class="subxComment"># setup</span>
+<span id="L556" class="LineNr">556 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L557" class="LineNr">557 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L558" class="LineNr">558 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L559" class="LineNr">559 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L560" class="LineNr">560 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L561" class="LineNr">561 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L562" class="LineNr">562 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L563" class="LineNr">563 </span>    <span class="subxComment"># write(_test-stream, &quot; ab&quot;)</span>
+<span id="L564" class="LineNr">564 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L565" class="LineNr">565 </span>    68/push  <span class="Constant">&quot; ab&quot;</span>/imm32
+<span id="L566" class="LineNr">566 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L567" class="LineNr">567 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L568" class="LineNr">568 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
+<span id="L569" class="LineNr">569 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L570" class="LineNr">570 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L571" class="LineNr">571 </span>    <span class="subxComment"># skip-chars-not-matching(_test-stream, 0x20/space)</span>
+<span id="L572" class="LineNr">572 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L573" class="LineNr">573 </span>    68/push  0x20/imm32
+<span id="L574" class="LineNr">574 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L575" class="LineNr">575 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L576" class="LineNr">576 </span>    e8/call  <a href='073next-token.subx.html#L470'>skip-chars-not-matching</a>/disp32
+<span id="L577" class="LineNr">577 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L578" class="LineNr">578 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L579" class="LineNr">579 </span>    <span class="subxComment"># check-ints-equal(_test-stream-&gt;read, 0, msg)</span>
+<span id="L580" class="LineNr">580 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L581" class="LineNr">581 </span>    68/push  <span class="Constant">&quot;F - test-skip-chars-not-matching-none&quot;</span>/imm32
+<span id="L582" class="LineNr">582 </span>    68/push  0/imm32
+<span id="L583" class="LineNr">583 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;read</span>
+<span id="L584" class="LineNr">584 </span>    b8/copy-to-EAX  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L585" class="LineNr">585 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+4)</span>
+<span id="L586" class="LineNr">586 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L587" class="LineNr">587 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L588" class="LineNr">588 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L589" class="LineNr">589 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L590" class="LineNr">590 </span>    <span class="subxComment"># end</span>
+<span id="L591" class="LineNr">591 </span>    c3/return
+<span id="L592" class="LineNr">592 </span>
+<span id="L593" class="LineNr">593 </span><span class="subxTest">test-skip-chars-not-matching-all</span>:
+<span id="L594" class="LineNr">594 </span>    <span class="subxComment"># setup</span>
+<span id="L595" class="LineNr">595 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L596" class="LineNr">596 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L597" class="LineNr">597 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L598" class="LineNr">598 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L599" class="LineNr">599 </span>    e8/call  <a href='055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L600" class="LineNr">600 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L601" class="LineNr">601 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L602" class="LineNr">602 </span>    <span class="subxComment"># write(_test-stream, &quot;ab&quot;)</span>
+<span id="L603" class="LineNr">603 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L604" class="LineNr">604 </span>    68/push  <span class="Constant">&quot;ab&quot;</span>/imm32
+<span id="L605" class="LineNr">605 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L606" class="LineNr">606 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L607" class="LineNr">607 </span>    e8/call  <a href='057write.subx.html#L24'>write</a>/disp32
+<span id="L608" class="LineNr">608 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L609" class="LineNr">609 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L610" class="LineNr">610 </span>    <span class="subxComment"># skip-chars-not-matching(_test-stream, 0x20/space)</span>
+<span id="L611" class="LineNr">611 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L612" class="LineNr">612 </span>    68/push  0x20/imm32
+<span id="L613" class="LineNr">613 </span>    68/push  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L614" class="LineNr">614 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L615" class="LineNr">615 </span>    e8/call  <a href='073next-token.subx.html#L470'>skip-chars-not-matching</a>/disp32
+<span id="L616" class="LineNr">616 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L617" class="LineNr">617 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L618" class="LineNr">618 </span>    <span class="subxComment"># check-ints-equal(_test-stream-&gt;read, 2, msg)</span>
+<span id="L619" class="LineNr">619 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L620" class="LineNr">620 </span>    68/push  <span class="Constant">&quot;F - test-skip-chars-not-matching-all&quot;</span>/imm32
+<span id="L621" class="LineNr">621 </span>    68/push  2/imm32
+<span id="L622" class="LineNr">622 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;read</span>
+<span id="L623" class="LineNr">623 </span>    b8/copy-to-EAX  <a href='057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L624" class="LineNr">624 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+4)</span>
+<span id="L625" class="LineNr">625 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L626" class="LineNr">626 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L627" class="LineNr">627 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L628" class="LineNr">628 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L629" class="LineNr">629 </span>    <span class="subxComment"># end</span>
+<span id="L630" class="LineNr">630 </span>    c3/return
+<span id="L631" class="LineNr">631 </span>
+<span id="L632" class="LineNr">632 </span><span class="subxFunction">skip-chars-not-matching-whitespace</span>:  <span class="subxComment"># in : (address stream)</span>
+<span id="L633" class="LineNr">633 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L634" class="LineNr">634 </span>    55/push-EBP
+<span id="L635" class="LineNr">635 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L636" class="LineNr">636 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L637" class="LineNr">637 </span>    50/push-EAX
+<span id="L638" class="LineNr">638 </span>    51/push-ECX
+<span id="L639" class="LineNr">639 </span>    53/push-EBX
+<span id="L640" class="LineNr">640 </span>    56/push-ESI
+<span id="L641" class="LineNr">641 </span>    <span class="subxComment"># ESI = in</span>
+<span id="L642" class="LineNr">642 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
+<span id="L643" class="LineNr">643 </span>    <span class="subxComment"># ECX = in-&gt;read</span>
+<span id="L644" class="LineNr">644 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESI+4) to ECX</span>
+<span id="L645" class="LineNr">645 </span>    <span class="subxComment"># EBX = in-&gt;write</span>
+<span id="L646" class="LineNr">646 </span>    8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ESI to EBX</span>
+<span id="L647" class="LineNr">647 </span><span class="Constant">$skip-chars-not-matching-whitespace:loop</span>:
+<span id="L648" class="LineNr">648 </span>    <span class="subxComment"># if (in-&gt;read &gt;= in-&gt;write) break</span>
+<span id="L649" class="LineNr">649 </span>    39/compare                      3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare ECX with EBX</span>
+<span id="L650" class="LineNr">650 </span>    7d/jump-if-greater-or-equal  $skip-chars-not-matching-whitespace:end/disp8
+<span id="L651" class="LineNr">651 </span>    <span class="subxComment"># EAX = in-&gt;data[in-&gt;read]</span>
+<span id="L652" class="LineNr">652 </span>    31/xor                          3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EAX</span>
+<span id="L653" class="LineNr">653 </span>    8a/copy-byte                    1/mod/*+disp8   4/rm32/sib    6/base/ESI  1/index/ECX  <span class="Normal"> . </span>          0/r32/AL    0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *(ESI+ECX+12) to AL</span>
+<span id="L654" class="LineNr">654 </span>    <span class="subxComment"># if (EAX == ' ') break</span>
+<span id="L655" class="LineNr">655 </span>    3d/compare-with-EAX  0x20/imm32/space
+<span id="L656" class="LineNr">656 </span>    74/jump-if-equal  $skip-chars-not-matching-whitespace:end/disp8
+<span id="L657" class="LineNr">657 </span>    <span class="subxComment"># if (EAX == '\n') break</span>
+<span id="L658" class="LineNr">658 </span>    3d/compare-with-EAX  0x0a/imm32/newline
+<span id="L659" class="LineNr">659 </span>    74/jump-if-equal  $skip-chars-not-matching-whitespace:end/disp8
+<span id="L660" class="LineNr">660 </span>    <span class="subxComment"># if (EAX == '\t') break</span>
+<span id="L661" class="LineNr">661 </span>    3d/compare-with-EAX  0x09/imm32/tab
+<span id="L662" class="LineNr">662 </span>    74/jump-if-equal  $skip-chars-not-matching-whitespace:end/disp8
+<span id="L663" class="LineNr">663 </span>    <span class="subxComment"># if (EAX == '\r') break</span>
+<span id="L664" class="LineNr">664 </span>    3d/compare-with-EAX  0x0d/imm32/cr
+<span id="L665" class="LineNr">665 </span>    74/jump-if-equal  $skip-chars-not-matching-whitespace:end/disp8
+<span id="L666" class="LineNr">666 </span>    <span class="subxComment"># ++in-&gt;read</span>
+<span id="L667" class="LineNr">667 </span>    41/inc-ECX
+<span id="L668" class="LineNr">668 </span>    eb/jump  $skip-chars-not-matching-whitespace:loop/disp8
+<span id="L669" class="LineNr">669 </span><span class="Constant">$skip-chars-not-matching-whitespace:end</span>:
+<span id="L670" class="LineNr">670 </span>    <span class="subxComment"># persist in-&gt;read</span>
+<span id="L671" class="LineNr">671 </span>    89/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy ECX to *(ESI+4)</span>
+<span id="L672" class="LineNr">672 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L673" class="LineNr">673 </span>    5e/pop-to-ESI
+<span id="L674" class="LineNr">674 </span>    5b/pop-to-EBX
+<span id="L675" class="LineNr">675 </span>    59/pop-to-ECX
+<span id="L676" class="LineNr">676 </span>    58/pop-to-EAX
+<span id="L677" class="LineNr">677 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L678" class="LineNr">678 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L679" class="LineNr">679 </span>    5d/pop-to-EBP
+<span id="L680" class="LineNr">680 </span>    c3/return
+<span id="L681" class="LineNr">681 </span>
+<span id="L682" class="LineNr">682 </span><span class="subxFunction">skip-chars-matching-in-slice</span>:  <span class="subxComment"># curr : (address byte), end : (address byte), delimiter : byte -&gt; curr/EAX</span>
+<span id="L683" class="LineNr">683 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L684" class="LineNr">684 </span>    55/push-EBP
+<span id="L685" class="LineNr">685 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L686" class="LineNr">686 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L687" class="LineNr">687 </span>    51/push-ECX
+<span id="L688" class="LineNr">688 </span>    52/push-EDX
+<span id="L689" class="LineNr">689 </span>    53/push-EBX
+<span id="L690" class="LineNr">690 </span>    <span class="subxComment"># EAX = curr</span>
+<span id="L691" class="LineNr">691 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
+<span id="L692" class="LineNr">692 </span>    <span class="subxComment"># ECX = end</span>
+<span id="L693" class="LineNr">693 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to ECX</span>
+<span id="L694" class="LineNr">694 </span>    <span class="subxComment"># EDX = delimiter</span>
+<span id="L695" class="LineNr">695 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   0x10/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+16) to EDX</span>
+<span id="L696" class="LineNr">696 </span>    <span class="subxComment"># EBX = 0</span>
+<span id="L697" class="LineNr">697 </span>    31/xor                          3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EBX</span>
+<span id="L698" class="LineNr">698 </span><span class="Constant">$skip-chars-matching-in-slice:loop</span>:
+<span id="L699" class="LineNr">699 </span>    <span class="subxComment"># if (curr &gt;= end) break</span>
+<span id="L700" class="LineNr">700 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX with ECX</span>
+<span id="L701" class="LineNr">701 </span>    7d/jump-if-greater-or-equal  $skip-chars-matching-in-slice:end/disp8
+<span id="L702" class="LineNr">702 </span>    <span class="subxComment"># if (*curr != delimiter) break</span>
+<span id="L703" class="LineNr">703 </span>    8a/copy-byte                    0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/BL   <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *EAX to BL</span>
+<span id="L704" class="LineNr">704 </span>    39/compare                      3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EBX and EDX</span>
+<span id="L705" class="LineNr">705 </span>    75/jump-if-not-equal  $skip-chars-matching-in-slice:end/disp8
+<span id="L706" class="LineNr">706 </span>    <span class="subxComment"># ++in-&gt;read</span>
+<span id="L707" class="LineNr">707 </span>    40/inc-EAX
+<span id="L708" class="LineNr">708 </span>    eb/jump  $skip-chars-matching-in-slice:loop/disp8
+<span id="L709" class="LineNr">709 </span><span class="Constant">$skip-chars-matching-in-slice:end</span>:
+<span id="L710" class="LineNr">710 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L711" class="LineNr">711 </span>    5b/pop-to-EBX
+<span id="L712" class="LineNr">712 </span>    5a/pop-to-EDX
+<span id="L713" class="LineNr">713 </span>    59/pop-to-ECX
+<span id="L714" class="LineNr">714 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L715" class="LineNr">715 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L716" class="LineNr">716 </span>    5d/pop-to-EBP
+<span id="L717" class="LineNr">717 </span>    c3/return
+<span id="L718" class="LineNr">718 </span>
+<span id="L719" class="LineNr">719 </span><span class="subxTest">test-skip-chars-matching-in-slice</span>:
+<span id="L720" class="LineNr">720 </span>    <span class="subxComment"># (EAX..ECX) = &quot;  ab&quot;</span>
+<span id="L721" class="LineNr">721 </span>    b8/copy-to-EAX  <span class="Constant">&quot;  ab&quot;</span>/imm32
+<span id="L722" class="LineNr">722 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EAX to ECX</span>
+<span id="L723" class="LineNr">723 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX+ECX+4 to ECX</span>
+<span id="L724" class="LineNr">724 </span>    05/add-to-EAX  4/imm32
+<span id="L725" class="LineNr">725 </span>    <span class="subxComment"># EAX = skip-chars-matching-in-slice(EAX, ECX, 0x20/space)</span>
+<span id="L726" class="LineNr">726 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L727" class="LineNr">727 </span>    68/push  0x20/imm32
+<span id="L728" class="LineNr">728 </span>    51/push-ECX
+<span id="L729" class="LineNr">729 </span>    50/push-EAX
+<span id="L730" class="LineNr">730 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L731" class="LineNr">731 </span>    e8/call  <a href='073next-token.subx.html#L682'>skip-chars-matching-in-slice</a>/disp32
+<span id="L732" class="LineNr">732 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L733" class="LineNr">733 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L734" class="LineNr">734 </span>    <span class="subxComment"># check-ints-equal(ECX-EAX, 2, msg)</span>
+<span id="L735" class="LineNr">735 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L736" class="LineNr">736 </span>    68/push  <span class="Constant">&quot;F - test-skip-chars-matching-in-slice&quot;</span>/imm32
+<span id="L737" class="LineNr">737 </span>    68/push  2/imm32
+<span id="L738" class="LineNr">738 </span>    <span class="subxS2Comment"># . . push ECX-EAX</span>
+<span id="L739" class="LineNr">739 </span>    29/subtract                     3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># subtract EAX from ECX</span>
+<span id="L740" class="LineNr">740 </span>    51/push-ECX
+<span id="L741" class="LineNr">741 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L742" class="LineNr">742 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L743" class="LineNr">743 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L744" class="LineNr">744 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L745" class="LineNr">745 </span>    <span class="subxComment"># end</span>
+<span id="L746" class="LineNr">746 </span>    c3/return
+<span id="L747" class="LineNr">747 </span>
+<span id="L748" class="LineNr">748 </span><span class="subxTest">test-skip-chars-matching-in-slice-none</span>:
+<span id="L749" class="LineNr">749 </span>    <span class="subxComment"># (EAX..ECX) = &quot;ab&quot;</span>
+<span id="L750" class="LineNr">750 </span>    b8/copy-to-EAX  <span class="Constant">&quot;ab&quot;</span>/imm32
+<span id="L751" class="LineNr">751 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EAX to ECX</span>
+<span id="L752" class="LineNr">752 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX+ECX+4 to ECX</span>
+<span id="L753" class="LineNr">753 </span>    05/add-to-EAX  4/imm32
+<span id="L754" class="LineNr">754 </span>    <span class="subxComment"># EAX = skip-chars-matching-in-slice(EAX, ECX, 0x20/space)</span>
+<span id="L755" class="LineNr">755 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L756" class="LineNr">756 </span>    68/push  0x20/imm32
+<span id="L757" class="LineNr">757 </span>    51/push-ECX
+<span id="L758" class="LineNr">758 </span>    50/push-EAX
+<span id="L759" class="LineNr">759 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L760" class="LineNr">760 </span>    e8/call  <a href='073next-token.subx.html#L682'>skip-chars-matching-in-slice</a>/disp32
+<span id="L761" class="LineNr">761 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L762" class="LineNr">762 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L763" class="LineNr">763 </span>    <span class="subxComment"># check-ints-equal(ECX-EAX, 2, msg)</span>
+<span id="L764" class="LineNr">764 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L765" class="LineNr">765 </span>    68/push  <span class="Constant">&quot;F - test-skip-chars-matching-in-slice-none&quot;</span>/imm32
+<span id="L766" class="LineNr">766 </span>    68/push  2/imm32
+<span id="L767" class="LineNr">767 </span>    <span class="subxS2Comment"># . . push ECX-EAX</span>
+<span id="L768" class="LineNr">768 </span>    29/subtract                     3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># subtract EAX from ECX</span>
+<span id="L769" class="LineNr">769 </span>    51/push-ECX
+<span id="L770" class="LineNr">770 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L771" class="LineNr">771 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L772" class="LineNr">772 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L773" class="LineNr">773 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L774" class="LineNr">774 </span>    <span class="subxComment"># end</span>
+<span id="L775" class="LineNr">775 </span>    c3/return
+<span id="L776" class="LineNr">776 </span>
+<span id="L777" class="LineNr">777 </span><span class="subxComment"># minor fork of 'skip-chars-matching-in-slice'</span>
+<span id="L778" class="LineNr">778 </span><span class="subxFunction">skip-chars-not-matching-in-slice</span>:  <span class="subxComment"># curr : (address byte), end : (address byte), delimiter : byte -&gt; curr/EAX</span>
+<span id="L779" class="LineNr">779 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L780" class="LineNr">780 </span>    55/push-EBP
+<span id="L781" class="LineNr">781 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L782" class="LineNr">782 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L783" class="LineNr">783 </span>    51/push-ECX
+<span id="L784" class="LineNr">784 </span>    52/push-EDX
+<span id="L785" class="LineNr">785 </span>    53/push-EBX
+<span id="L786" class="LineNr">786 </span>    <span class="subxComment"># EAX = curr</span>
+<span id="L787" class="LineNr">787 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
+<span id="L788" class="LineNr">788 </span>    <span class="subxComment"># ECX = end</span>
+<span id="L789" class="LineNr">789 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to ECX</span>
+<span id="L790" class="LineNr">790 </span>    <span class="subxComment"># EDX = delimiter</span>
+<span id="L791" class="LineNr">791 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   0x10/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+16) to EDX</span>
+<span id="L792" class="LineNr">792 </span>    <span class="subxComment"># EBX = 0</span>
+<span id="L793" class="LineNr">793 </span>    31/xor                          3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EBX</span>
+<span id="L794" class="LineNr">794 </span><span class="Constant">$skip-chars-not-matching-in-slice:loop</span>:
+<span id="L795" class="LineNr">795 </span>    <span class="subxComment"># if (curr &gt;= end) break</span>
+<span id="L796" class="LineNr">796 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX with ECX</span>
+<span id="L797" class="LineNr">797 </span>    7d/jump-if-greater-or-equal  $skip-chars-not-matching-in-slice:end/disp8
+<span id="L798" class="LineNr">798 </span>    <span class="subxComment"># if (*curr == delimiter) break</span>
+<span id="L799" class="LineNr">799 </span>    8a/copy-byte                    0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/BL   <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *EAX to BL</span>
+<span id="L800" class="LineNr">800 </span>    39/compare                      3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EBX and EDX</span>
+<span id="L801" class="LineNr">801 </span>    74/jump-if-equal  $skip-chars-not-matching-in-slice:end/disp8
+<span id="L802" class="LineNr">802 </span>    <span class="subxComment"># ++in-&gt;read</span>
+<span id="L803" class="LineNr">803 </span>    40/inc-EAX
+<span id="L804" class="LineNr">804 </span>    eb/jump  $skip-chars-not-matching-in-slice:loop/disp8
+<span id="L805" class="LineNr">805 </span><span class="Constant">$skip-chars-not-matching-in-slice:end</span>:
+<span id="L806" class="LineNr">806 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L807" class="LineNr">807 </span>    5b/pop-to-EBX
+<span id="L808" class="LineNr">808 </span>    5a/pop-to-EDX
+<span id="L809" class="LineNr">809 </span>    59/pop-to-ECX
+<span id="L810" class="LineNr">810 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L811" class="LineNr">811 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L812" class="LineNr">812 </span>    5d/pop-to-EBP
+<span id="L813" class="LineNr">813 </span>    c3/return
+<span id="L814" class="LineNr">814 </span>
+<span id="L815" class="LineNr">815 </span><span class="subxTest">test-skip-chars-not-matching-in-slice</span>:
+<span id="L816" class="LineNr">816 </span>    <span class="subxComment"># (EAX..ECX) = &quot;ab &quot;</span>
+<span id="L817" class="LineNr">817 </span>    b8/copy-to-EAX  <span class="Constant">&quot;ab &quot;</span>/imm32
+<span id="L818" class="LineNr">818 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EAX to ECX</span>
+<span id="L819" class="LineNr">819 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX+ECX+4 to ECX</span>
+<span id="L820" class="LineNr">820 </span>    05/add-to-EAX  4/imm32
+<span id="L821" class="LineNr">821 </span>    <span class="subxComment"># EAX = skip-chars-not-matching-in-slice(EAX, ECX, 0x20/space)</span>
+<span id="L822" class="LineNr">822 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L823" class="LineNr">823 </span>    68/push  0x20/imm32
+<span id="L824" class="LineNr">824 </span>    51/push-ECX
+<span id="L825" class="LineNr">825 </span>    50/push-EAX
+<span id="L826" class="LineNr">826 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L827" class="LineNr">827 </span>    e8/call  <a href='073next-token.subx.html#L778'>skip-chars-not-matching-in-slice</a>/disp32
+<span id="L828" class="LineNr">828 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L829" class="LineNr">829 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L830" class="LineNr">830 </span>    <span class="subxComment"># check-ints-equal(ECX-EAX, 1, msg)</span>
+<span id="L831" class="LineNr">831 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L832" class="LineNr">832 </span>    68/push  <span class="Constant">&quot;F - test-skip-chars-not-matching-in-slice&quot;</span>/imm32
+<span id="L833" class="LineNr">833 </span>    68/push  1/imm32
+<span id="L834" class="LineNr">834 </span>    <span class="subxS2Comment"># . . push ECX-EAX</span>
+<span id="L835" class="LineNr">835 </span>    29/subtract                     3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># subtract EAX from ECX</span>
+<span id="L836" class="LineNr">836 </span>    51/push-ECX
+<span id="L837" class="LineNr">837 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L838" class="LineNr">838 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L839" class="LineNr">839 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L840" class="LineNr">840 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L841" class="LineNr">841 </span>    <span class="subxComment"># end</span>
+<span id="L842" class="LineNr">842 </span>    c3/return
+<span id="L843" class="LineNr">843 </span>
+<span id="L844" class="LineNr">844 </span><span class="subxTest">test-skip-chars-not-matching-in-slice-none</span>:
+<span id="L845" class="LineNr">845 </span>    <span class="subxComment"># (EAX..ECX) = &quot; ab&quot;</span>
+<span id="L846" class="LineNr">846 </span>    b8/copy-to-EAX  <span class="Constant">&quot; ab&quot;</span>/imm32
+<span id="L847" class="LineNr">847 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EAX to ECX</span>
+<span id="L848" class="LineNr">848 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX+ECX+4 to ECX</span>
+<span id="L849" class="LineNr">849 </span>    05/add-to-EAX  4/imm32
+<span id="L850" class="LineNr">850 </span>    <span class="subxComment"># EAX = skip-chars-not-matching-in-slice(EAX, ECX, 0x20/space)</span>
+<span id="L851" class="LineNr">851 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L852" class="LineNr">852 </span>    68/push  0x20/imm32
+<span id="L853" class="LineNr">853 </span>    51/push-ECX
+<span id="L854" class="LineNr">854 </span>    50/push-EAX
+<span id="L855" class="LineNr">855 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L856" class="LineNr">856 </span>    e8/call  <a href='073next-token.subx.html#L778'>skip-chars-not-matching-in-slice</a>/disp32
+<span id="L857" class="LineNr">857 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L858" class="LineNr">858 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L859" class="LineNr">859 </span>    <span class="subxComment"># check-ints-equal(ECX-EAX, 3, msg)</span>
+<span id="L860" class="LineNr">860 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L861" class="LineNr">861 </span>    68/push  <span class="Constant">&quot;F - test-skip-chars-not-matching-in-slice-none&quot;</span>/imm32
+<span id="L862" class="LineNr">862 </span>    68/push  3/imm32
+<span id="L863" class="LineNr">863 </span>    <span class="subxS2Comment"># . . push ECX-EAX</span>
+<span id="L864" class="LineNr">864 </span>    29/subtract                     3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># subtract EAX from ECX</span>
+<span id="L865" class="LineNr">865 </span>    51/push-ECX
+<span id="L866" class="LineNr">866 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L867" class="LineNr">867 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L868" class="LineNr">868 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L869" class="LineNr">869 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L870" class="LineNr">870 </span>    <span class="subxComment"># end</span>
+<span id="L871" class="LineNr">871 </span>    c3/return
+<span id="L872" class="LineNr">872 </span>
+<span id="L873" class="LineNr">873 </span><span class="subxTest">test-skip-chars-not-matching-in-slice-all</span>:
+<span id="L874" class="LineNr">874 </span>    <span class="subxComment"># (EAX..ECX) = &quot;ab&quot;</span>
+<span id="L875" class="LineNr">875 </span>    b8/copy-to-EAX  <span class="Constant">&quot;ab&quot;</span>/imm32
+<span id="L876" class="LineNr">876 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EAX to ECX</span>
+<span id="L877" class="LineNr">877 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX+ECX+4 to ECX</span>
+<span id="L878" class="LineNr">878 </span>    05/add-to-EAX  4/imm32
+<span id="L879" class="LineNr">879 </span>    <span class="subxComment"># EAX = skip-chars-not-matching-in-slice(EAX, ECX, 0x20/space)</span>
+<span id="L880" class="LineNr">880 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L881" class="LineNr">881 </span>    68/push  0x20/imm32
+<span id="L882" class="LineNr">882 </span>    51/push-ECX
+<span id="L883" class="LineNr">883 </span>    50/push-EAX
+<span id="L884" class="LineNr">884 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L885" class="LineNr">885 </span>    e8/call  <a href='073next-token.subx.html#L778'>skip-chars-not-matching-in-slice</a>/disp32
+<span id="L886" class="LineNr">886 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L887" class="LineNr">887 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L888" class="LineNr">888 </span>    <span class="subxComment"># check-ints-equal(ECX-EAX, 0, msg)</span>
+<span id="L889" class="LineNr">889 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L890" class="LineNr">890 </span>    68/push  <span class="Constant">&quot;F - test-skip-chars-not-matching-in-slice-all&quot;</span>/imm32
+<span id="L891" class="LineNr">891 </span>    68/push  0/imm32
+<span id="L892" class="LineNr">892 </span>    <span class="subxS2Comment"># . . push ECX-EAX</span>
+<span id="L893" class="LineNr">893 </span>    29/subtract                     3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># subtract EAX from ECX</span>
+<span id="L894" class="LineNr">894 </span>    51/push-ECX
+<span id="L895" class="LineNr">895 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L896" class="LineNr">896 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L897" class="LineNr">897 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L898" class="LineNr">898 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L899" class="LineNr">899 </span>    <span class="subxComment"># end</span>
+<span id="L900" class="LineNr">900 </span>    c3/return
+<span id="L901" class="LineNr">901 </span>
+<span id="L902" class="LineNr">902 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/apps/crenshaw2-1.subx.html b/html/subx/apps/crenshaw2-1.subx.html
index 7a957d61..b950dcfb 100644
--- a/html/subx/apps/crenshaw2-1.subx.html
+++ b/html/subx/apps/crenshaw2-1.subx.html
@@ -264,7 +264,7 @@ if ('onhashchange' in window) {
 <span id="L201" class="LineNr">201 </span><span class="subxFunction">get-num</span>:  <span class="subxComment"># in : (address buffered-file), out : (address stream), err : fd or (address stream), ed : (address exit-descriptor) -&gt; &lt;void&gt;</span>
 <span id="L202" class="LineNr">202 </span>    <span class="subxComment"># pseudocode:</span>
 <span id="L203" class="LineNr">203 </span>    <span class="subxComment">#   if (!is-digit?(Look)) expected(ed, err, &quot;integer&quot;)</span>
-<span id="L204" class="LineNr">204 </span>    <span class="subxComment">#   if (out-&gt;write &gt;= out-&gt;length)</span>
+<span id="L204" class="LineNr">204 </span>    <span class="subxComment">#   if out-&gt;write &gt;= out-&gt;length</span>
 <span id="L205" class="LineNr">205 </span>    <span class="subxComment">#     write(err, &quot;Error: too many digits in number\n&quot;)</span>
 <span id="L206" class="LineNr">206 </span>    <span class="subxComment">#     stop(ed, 1)</span>
 <span id="L207" class="LineNr">207 </span>    <span class="subxComment">#   out-&gt;data[out-&gt;write] = LSB(Look)</span>
diff --git a/html/subx/apps/crenshaw2-1b.subx.html b/html/subx/apps/crenshaw2-1b.subx.html
index 42cb3fe0..932e7ed5 100644
--- a/html/subx/apps/crenshaw2-1b.subx.html
+++ b/html/subx/apps/crenshaw2-1b.subx.html
@@ -266,13 +266,13 @@ if ('onhashchange' in window) {
 <span id="L203" class="LineNr">203 </span>    <span class="subxComment"># pseudocode:</span>
 <span id="L204" class="LineNr">204 </span>    <span class="subxComment">#   if (!is-digit?(Look)) expected(ed, err, &quot;integer&quot;)</span>
 <span id="L205" class="LineNr">205 </span>    <span class="subxComment">#   do</span>
-<span id="L206" class="LineNr">206 </span>    <span class="subxComment">#     if (out-&gt;write &gt;= out-&gt;length)</span>
+<span id="L206" class="LineNr">206 </span>    <span class="subxComment">#     if out-&gt;write &gt;= out-&gt;length</span>
 <span id="L207" class="LineNr">207 </span>    <span class="subxComment">#       write(err, &quot;Error: too many digits in number\n&quot;)</span>
 <span id="L208" class="LineNr">208 </span>    <span class="subxComment">#       stop(ed, 1)</span>
 <span id="L209" class="LineNr">209 </span>    <span class="subxComment">#     out-&gt;data[out-&gt;write] = LSB(Look)</span>
 <span id="L210" class="LineNr">210 </span>    <span class="subxComment">#     ++out-&gt;write</span>
 <span id="L211" class="LineNr">211 </span>    <span class="subxComment">#     Look = get-char(in)</span>
-<span id="L212" class="LineNr">212 </span>    <span class="subxComment">#   while (is-digit?(Look))</span>
+<span id="L212" class="LineNr">212 </span>    <span class="subxComment">#   while is-digit?(Look)</span>
 <span id="L213" class="LineNr">213 </span>    <span class="subxComment"># This is complicated because I don't want to hard-code the error strategy in</span>
 <span id="L214" class="LineNr">214 </span>    <span class="subxComment"># a general helper like write-byte. Maybe I should just create a local helper.</span>
 <span id="L215" class="LineNr">215 </span>    <span class="subxComment">#</span>
diff --git a/html/subx/apps/hex.subx.html b/html/subx/apps/hex.subx.html
index 94515434..125478ec 100644
--- a/html/subx/apps/hex.subx.html
+++ b/html/subx/apps/hex.subx.html
@@ -135,7 +135,7 @@ if ('onhashchange' in window) {
 <span id="L72" class="LineNr">  72 </span><span class="subxComment"># the main entry point</span>
 <span id="L73" class="LineNr">  73 </span><span class="subxFunction">convert</span>:  <span class="subxComment"># in : (address buffered-file), out : (address buffered-file), err : (address buffered-file), ed : (address exit-descriptor) -&gt; &lt;void&gt;</span>
 <span id="L74" class="LineNr">  74 </span>    <span class="subxComment"># pseudocode:</span>
-<span id="L75" class="LineNr">  75 </span>    <span class="subxComment">#   repeatedly</span>
+<span id="L75" class="LineNr">  75 </span>    <span class="subxComment">#   while true</span>
 <span id="L76" class="LineNr">  76 </span>    <span class="subxComment">#     EAX = convert-next-octet(in, err, ed)</span>
 <span id="L77" class="LineNr">  77 </span>    <span class="subxComment">#     if (EAX == Eof) break</span>
 <span id="L78" class="LineNr">  78 </span>    <span class="subxComment">#     write-byte(out, AL)</span>
@@ -551,7 +551,7 @@ if ('onhashchange' in window) {
 <span id="L488" class="LineNr"> 488 </span><span class="subxComment"># abort on any other byte</span>
 <span id="L489" class="LineNr"> 489 </span><span class="subxFunction">scan-next-byte</span>:  <span class="subxComment"># in : (address buffered-file), err : (address buffered-file), ed : (address exit-descriptor) -&gt; byte-or-Eof/EAX</span>
 <span id="L490" class="LineNr"> 490 </span>    <span class="subxComment"># pseudocode:</span>
-<span id="L491" class="LineNr"> 491 </span>    <span class="subxComment">#   repeatedly</span>
+<span id="L491" class="LineNr"> 491 </span>    <span class="subxComment">#   while true</span>
 <span id="L492" class="LineNr"> 492 </span>    <span class="subxComment">#     EAX = read-byte(in)</span>
 <span id="L493" class="LineNr"> 493 </span>    <span class="subxComment">#     if (EAX == Eof) return EAX</span>
 <span id="L494" class="LineNr"> 494 </span>    <span class="subxComment">#     if (is-hex-digit?(EAX)) return EAX</span>
@@ -1475,7 +1475,7 @@ if ('onhashchange' in window) {
 <span id="L1412" class="LineNr">1412 </span><span class="subxFunction">skip-until-newline</span>:  <span class="subxComment"># in : (address buffered-file) -&gt; &lt;void&gt;</span>
 <span id="L1413" class="LineNr">1413 </span>    <span class="subxComment"># pseudocode:</span>
 <span id="L1414" class="LineNr">1414 </span>    <span class="subxComment">#   push EAX</span>
-<span id="L1415" class="LineNr">1415 </span>    <span class="subxComment">#   repeatedly:</span>
+<span id="L1415" class="LineNr">1415 </span>    <span class="subxComment">#   while true</span>
 <span id="L1416" class="LineNr">1416 </span>    <span class="subxComment">#     EAX = read-byte(in)</span>
 <span id="L1417" class="LineNr">1417 </span>    <span class="subxComment">#     if (EAX == Eof) break</span>
 <span id="L1418" class="LineNr">1418 </span>    <span class="subxComment">#     if (EAX == 0x0a) break</span>
diff --git a/html/subx/apps/pack.subx.html b/html/subx/apps/pack.subx.html
index 0bd3e063..f712b539 100644
--- a/html/subx/apps/pack.subx.html
+++ b/html/subx/apps/pack.subx.html
@@ -16,12 +16,13 @@ a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
 .subxComment { color: #005faf; }
 .subxS2Comment { color: #8a8a8a; }
+.subxMinorFunction { color: #875f5f; }
 .LineNr { }
 .subxS1Comment { color: #0000af; }
 .SpecialChar { color: #d70000; }
 .Constant { color: #008787; }
 .subxFunction { color: #af5f00; text-decoration: underline; }
-.subxMinorFunction { color: #875f5f; }
+.Folded { color: #080808; background-color: #949494; }
 .Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 .subxTest { color: #5f8700; }
 .CommentedCode { color: #8a8a8a; }
@@ -85,8 +86,8 @@ if ('onhashchange' in window) {
 <span id="L22" class="LineNr">  22 </span>
 <span id="L23" class="LineNr">  23 </span><span class="SpecialChar">Entry</span>:  <span class="subxComment"># run tests if necessary, convert stdin if not</span>
 <span id="L24" class="LineNr">  24 </span>
-<span id="L25" class="LineNr">  25 </span><span class="CommentedCode">#?     # for debugging: run a single test</span>
-<span id="L26" class="LineNr">  26 </span><span class="CommentedCode">#?     e8/call test-convert-instruction-passes-labels-through/disp32</span>
+<span id="L25" class="LineNr">  25 </span>    <span class="subxComment"># for debugging: run a single test</span>
+<span id="L26" class="LineNr">  26 </span><span class="CommentedCode">#?     e8/call test-convert-in-data-segment/disp32</span>
 <span id="L27" class="LineNr">  27 </span><span class="CommentedCode">#?     8b/copy                         0/mod/indirect  5/rm32/.disp32            .             .           3/r32/EBX   Num-test-failures/disp32          # copy *Num-test-failures to EBX</span>
 <span id="L28" class="LineNr">  28 </span><span class="CommentedCode">#?     eb/jump  $main:end/disp8</span>
 <span id="L29" class="LineNr">  29 </span>
@@ -126,7 +127,7 @@ if ('onhashchange' in window) {
 <span id="L63" class="LineNr">  63 </span>    68/push  <span class="SpecialChar"><a href='../064write-byte.subx.html#L10'>Stdout</a></span>/imm32
 <span id="L64" class="LineNr">  64 </span>    68/push  <span class="SpecialChar"><a href='../061read-byte.subx.html#L14'>Stdin</a></span>/imm32
 <span id="L65" class="LineNr">  65 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L66" class="LineNr">  66 </span>    e8/call  <a href='pack.subx.html#L86'>convert</a>/disp32
+<span id="L66" class="LineNr">  66 </span>    e8/call  <a href='pack.subx.html#L95'>convert</a>/disp32
 <span id="L67" class="LineNr">  67 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L68" class="LineNr">  68 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
 <span id="L69" class="LineNr">  69 </span>    <span class="subxS1Comment"># . syscall(exit, 0)</span>
@@ -146,1619 +147,3046 @@ if ('onhashchange' in window) {
 <span id="L83" class="LineNr">  83 </span><span class="subxComment"># primary state: line</span>
 <span id="L84" class="LineNr">  84 </span><span class="subxComment">#   stream of 512 bytes; abort if it ever overflows</span>
 <span id="L85" class="LineNr">  85 </span>
-<span id="L86" class="LineNr">  86 </span><span class="subxFunction">convert</span>:  <span class="subxComment"># in : (address buffered-file), out : (address buffered-file) -&gt; &lt;void&gt;</span>
-<span id="L87" class="LineNr">  87 </span>    <span class="subxComment"># pseudocode:</span>
-<span id="L88" class="LineNr">  88 </span>    <span class="subxComment">#   var line = new-stream(512, 1)</span>
-<span id="L89" class="LineNr">  89 </span>    <span class="subxComment">#   repeatedly</span>
-<span id="L90" class="LineNr">  90 </span>    <span class="subxComment">#     clear-stream(line)</span>
-<span id="L91" class="LineNr">  91 </span>    <span class="subxComment">#     EAX = read-line(in, line)</span>
-<span id="L92" class="LineNr">  92 </span>    <span class="subxComment">#     if (EAX == Eof) break</span>
-<span id="L93" class="LineNr">  93 </span>    <span class="subxComment">#     word-slice = next-word(line)</span>
-<span id="L94" class="LineNr">  94 </span>    <span class="subxComment">#     if (slice-empty?(word-slice)) continue  # just whitespace</span>
-<span id="L95" class="LineNr">  95 </span>    <span class="subxComment">#     if (starts-with(word-slice, &quot;#&quot;)) continue  # ignore comments</span>
-<span id="L96" class="LineNr">  96 </span>    <span class="subxComment">#     assert(slice-equal?(word-slice, &quot;==&quot;))</span>
-<span id="L97" class="LineNr">  97 </span>    <span class="subxComment">#     word-slice = next-word(line)</span>
-<span id="L98" class="LineNr">  98 </span>    <span class="subxComment">#     if (slice-equal?(word-slice, &quot;code&quot;))</span>
-<span id="L99" class="LineNr">  99 </span>    <span class="subxComment">#       convert-code-segment(in, out)</span>
-<span id="L100" class="LineNr"> 100 </span>    <span class="subxComment">#     else</span>
-<span id="L101" class="LineNr"> 101 </span>    <span class="subxComment">#       convert-data-segment(in, out)</span>
-<span id="L102" class="LineNr"> 102 </span>    <span class="subxComment">#   flush(out)</span>
-<span id="L103" class="LineNr"> 103 </span>    <span class="subxComment">#</span>
-<span id="L104" class="LineNr"> 104 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L105" class="LineNr"> 105 </span>    55/push-EBP
-<span id="L106" class="LineNr"> 106 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L107" class="LineNr"> 107 </span>    <span class="subxS1Comment"># . save registers</span>
-<span id="L108" class="LineNr"> 108 </span>    51/push-ECX
-<span id="L109" class="LineNr"> 109 </span>    <span class="subxComment"># var line/ECX : (address stream byte) = stream(512)</span>
-<span id="L110" class="LineNr"> 110 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x200/imm32       <span class="subxComment"># subtract from ESP</span>
-<span id="L111" class="LineNr"> 111 </span>    68/push  0x200/imm32/length
-<span id="L112" class="LineNr"> 112 </span>    68/push  0/imm32/read
-<span id="L113" class="LineNr"> 113 </span>    68/push  0/imm32/write
-<span id="L114" class="LineNr"> 114 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
-<span id="L115" class="LineNr"> 115 </span><span class="Constant">$convert:loop</span>:
-<span id="L116" class="LineNr"> 116 </span>    <span class="subxComment"># clear-stream(ECX)</span>
-<span id="L117" class="LineNr"> 117 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L118" class="LineNr"> 118 </span>    51/push-ECX
-<span id="L119" class="LineNr"> 119 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L120" class="LineNr"> 120 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L121" class="LineNr"> 121 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L122" class="LineNr"> 122 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L123" class="LineNr"> 123 </span>    <span class="subxComment"># EAX = read-line(in, line)</span>
-<span id="L124" class="LineNr"> 124 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L125" class="LineNr"> 125 </span>    51/push-ECX
-<span id="L126" class="LineNr"> 126 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
-<span id="L127" class="LineNr"> 127 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L128" class="LineNr"> 128 </span>    e8/call  <a href='pack.subx.html#L233'>convert-instruction</a>/disp32
-<span id="L129" class="LineNr"> 129 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L130" class="LineNr"> 130 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L131" class="LineNr"> 131 </span>    <span class="subxComment"># if (EAX == Eof) break</span>
-<span id="L132" class="LineNr"> 132 </span>    3d/compare-with-EAX  0xffffffff/imm32/Eof
-<span id="L133" class="LineNr"> 133 </span>    74/jump-if-equal  $convert:break/disp8
-<span id="L134" class="LineNr"> 134 </span>    <span class="subxComment"># convert-instruction(line, out)</span>
-<span id="L135" class="LineNr"> 135 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L136" class="LineNr"> 136 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
-<span id="L137" class="LineNr"> 137 </span>    51/push-ECX
-<span id="L138" class="LineNr"> 138 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L139" class="LineNr"> 139 </span>    e8/call  <a href='pack.subx.html#L233'>convert-instruction</a>/disp32
-<span id="L140" class="LineNr"> 140 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L141" class="LineNr"> 141 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L142" class="LineNr"> 142 </span><span class="Constant">$convert:break</span>:
-<span id="L143" class="LineNr"> 143 </span>    <span class="subxComment"># flush(out)</span>
-<span id="L144" class="LineNr"> 144 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L145" class="LineNr"> 145 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
-<span id="L146" class="LineNr"> 146 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L147" class="LineNr"> 147 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
-<span id="L148" class="LineNr"> 148 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L149" class="LineNr"> 149 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L150" class="LineNr"> 150 </span><span class="Constant">$convert:end</span>:
-<span id="L151" class="LineNr"> 151 </span>    <span class="subxS1Comment"># . reclaim locals</span>
-<span id="L152" class="LineNr"> 152 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x20c/imm32       <span class="subxComment"># add to ESP</span>
-<span id="L153" class="LineNr"> 153 </span>    <span class="subxS1Comment"># . restore registers</span>
-<span id="L154" class="LineNr"> 154 </span>    59/pop-to-ECX
-<span id="L155" class="LineNr"> 155 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L156" class="LineNr"> 156 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L157" class="LineNr"> 157 </span>    5d/pop-to-EBP
-<span id="L158" class="LineNr"> 158 </span>    c3/return
-<span id="L159" class="LineNr"> 159 </span>
-<span id="L160" class="LineNr"> 160 </span><span class="subxFunction">convert-code-segment</span>:  <span class="subxComment"># in : (address buffered-file), out : (address buffered-file) -&gt; &lt;void&gt;</span>
-<span id="L161" class="LineNr"> 161 </span>    <span class="subxComment"># pseudocode:</span>
-<span id="L162" class="LineNr"> 162 </span>    <span class="subxComment">#   var line = new-stream(512, 1)</span>
-<span id="L163" class="LineNr"> 163 </span>    <span class="subxComment">#   repeatedly</span>
-<span id="L164" class="LineNr"> 164 </span>    <span class="subxComment">#     clear-stream(line)</span>
-<span id="L165" class="LineNr"> 165 </span>    <span class="subxComment">#     EAX = read-line(in, line)</span>
-<span id="L166" class="LineNr"> 166 </span>    <span class="subxComment">#     if (EAX == Eof) break</span>
-<span id="L167" class="LineNr"> 167 </span>    <span class="subxComment">#     word-slice = next-word(line)</span>
-<span id="L168" class="LineNr"> 168 </span>    <span class="subxComment">#     if (slice-equal?(word-slice, &quot;==&quot;))</span>
-<span id="L169" class="LineNr"> 169 </span>    <span class="subxComment">#       return</span>
-<span id="L170" class="LineNr"> 170 </span>    <span class="subxComment">#     convert-instruction(line, out)</span>
-<span id="L171" class="LineNr"> 171 </span>
-<span id="L172" class="LineNr"> 172 </span><span class="subxFunction">convert-data-segment</span>:  <span class="subxComment"># in : (address buffered-file), out : (address buffered-file) -&gt; &lt;void&gt;</span>
-<span id="L173" class="LineNr"> 173 </span>    <span class="subxComment"># pseudocode:</span>
-<span id="L174" class="LineNr"> 174 </span>    <span class="subxComment">#   var line = new-stream(512, 1)</span>
-<span id="L175" class="LineNr"> 175 </span>    <span class="subxComment">#   repeatedly</span>
-<span id="L176" class="LineNr"> 176 </span>    <span class="subxComment">#     clear-stream(line)</span>
-<span id="L177" class="LineNr"> 177 </span>    <span class="subxComment">#     EAX = read-line(in, line)</span>
-<span id="L178" class="LineNr"> 178 </span>    <span class="subxComment">#     if (EAX == Eof) break</span>
-<span id="L179" class="LineNr"> 179 </span>    <span class="subxComment">#     word-slice = next-word(line)</span>
-<span id="L180" class="LineNr"> 180 </span>    <span class="subxComment">#     if (slice-equal?(word-slice, &quot;==&quot;))</span>
-<span id="L181" class="LineNr"> 181 </span>    <span class="subxComment">#       return</span>
-<span id="L182" class="LineNr"> 182 </span>    <span class="subxComment">#     convert-data-word(line, out)</span>
-<span id="L183" class="LineNr"> 183 </span>
-<span id="L184" class="LineNr"> 184 </span><span class="subxH1Comment"># - To pack an instruction, following the C++ version:</span>
-<span id="L185" class="LineNr"> 185 </span><span class="subxComment"># read first word as opcode and write-slice</span>
-<span id="L186" class="LineNr"> 186 </span><span class="subxComment"># if 0f or f2 or f3 read second opcode and write-slice</span>
-<span id="L187" class="LineNr"> 187 </span><span class="subxComment"># if 'f2 0f' or 'f3 0f' read third opcode and write-slice</span>
-<span id="L188" class="LineNr"> 188 </span><span class="subxComment"># while true:</span>
-<span id="L189" class="LineNr"> 189 </span><span class="subxComment">#   word-slice = next-word</span>
-<span id="L190" class="LineNr"> 190 </span><span class="subxComment">#   if empty(word-slice) break</span>
-<span id="L191" class="LineNr"> 191 </span><span class="subxComment">#   if has metadata 'mod', parse into mod</span>
-<span id="L192" class="LineNr"> 192 </span><span class="subxComment">#   if has metadata 'rm32', parse into rm32</span>
-<span id="L193" class="LineNr"> 193 </span><span class="subxComment">#   if has metadata 'r32', parse into r32</span>
-<span id="L194" class="LineNr"> 194 </span><span class="subxComment">#   if has metadata 'subop', parse into r32</span>
-<span id="L195" class="LineNr"> 195 </span><span class="subxComment"># if at least one of the 3 was present, print-byte</span>
-<span id="L196" class="LineNr"> 196 </span><span class="subxComment"># while true:</span>
-<span id="L197" class="LineNr"> 197 </span><span class="subxComment">#   word-slice = next-word</span>
-<span id="L198" class="LineNr"> 198 </span><span class="subxComment">#   if empty(word-slice) break</span>
-<span id="L199" class="LineNr"> 199 </span><span class="subxComment">#   if has metadata 'base', parse into base</span>
-<span id="L200" class="LineNr"> 200 </span><span class="subxComment">#   if has metadata 'index', parse into index</span>
-<span id="L201" class="LineNr"> 201 </span><span class="subxComment">#   if has metadata 'scale', parse into scale</span>
-<span id="L202" class="LineNr"> 202 </span><span class="subxComment"># if at least one of the 3 was present, print-byte</span>
-<span id="L203" class="LineNr"> 203 </span><span class="subxComment"># parse errors =&gt; &lt;abort&gt;</span>
-<span id="L204" class="LineNr"> 204 </span><span class="subxComment"># while true:</span>
-<span id="L205" class="LineNr"> 205 </span><span class="subxComment">#   word-slice = next-word</span>
-<span id="L206" class="LineNr"> 206 </span><span class="subxComment">#   if empty(word-slice) break</span>
-<span id="L207" class="LineNr"> 207 </span><span class="subxComment">#   if has metadata 'disp8', emit as 1 byte</span>
-<span id="L208" class="LineNr"> 208 </span><span class="subxComment">#   if has metadata 'disp16', emit as 2 bytes</span>
-<span id="L209" class="LineNr"> 209 </span><span class="subxComment">#   if has metadata 'disp32', emit as 4 bytes</span>
-<span id="L210" class="LineNr"> 210 </span><span class="subxComment"># while true:</span>
-<span id="L211" class="LineNr"> 211 </span><span class="subxComment">#   word-slice = next-word</span>
-<span id="L212" class="LineNr"> 212 </span><span class="subxComment">#   if empty(word-slice) break</span>
-<span id="L213" class="LineNr"> 213 </span><span class="subxComment">#   if has metadata 'imm8', emit</span>
-<span id="L214" class="LineNr"> 214 </span><span class="subxComment">#   if has metadata 'imm32', emit as 4 bytes</span>
-<span id="L215" class="LineNr"> 215 </span><span class="subxComment"># finally, emit line prefixed with a '  # '</span>
-<span id="L216" class="LineNr"> 216 </span>
-<span id="L217" class="LineNr"> 217 </span><span class="subxComment"># simplifications since we perform zero error handling (continuing to rely on the C++ version for that):</span>
-<span id="L218" class="LineNr"> 218 </span><span class="subxComment">#   missing fields are always 0-filled</span>
-<span id="L219" class="LineNr"> 219 </span><span class="subxComment">#   bytes never mentioned are silently dropped; if you don't provide /mod, /rm32 or /r32 you don't get a 0 modrm byte. You get *no* modrm byte.</span>
-<span id="L220" class="LineNr"> 220 </span><span class="subxComment">#   in case of conflict, last operand with a name is recognized</span>
-<span id="L221" class="LineNr"> 221 </span><span class="subxComment">#   silently drop extraneous operands</span>
-<span id="L222" class="LineNr"> 222 </span><span class="subxComment">#   unceremoniously abort on non-numeric operands except disp or imm</span>
-<span id="L223" class="LineNr"> 223 </span>
-<span id="L224" class="LineNr"> 224 </span><span class="subxComment"># conceptual hierarchy within a line:</span>
-<span id="L225" class="LineNr"> 225 </span><span class="subxComment">#   line = words separated by ' ', maybe followed by comment starting with '#'</span>
-<span id="L226" class="LineNr"> 226 </span><span class="subxComment">#   word = name until '/', then 0 or more metadata separated by '/'</span>
-<span id="L227" class="LineNr"> 227 </span><span class="subxComment">#</span>
-<span id="L228" class="LineNr"> 228 </span><span class="subxComment"># we won't bother saving the internal structure of lines; reparsing should be cheap using three primitives:</span>
-<span id="L229" class="LineNr"> 229 </span><span class="subxComment">#   next-token(stream, delim char) -&gt; slice (start, end pointers)</span>
-<span id="L230" class="LineNr"> 230 </span><span class="subxComment">#   next-token(stream, slice, delim char) -&gt; slice'</span>
-<span id="L231" class="LineNr"> 231 </span><span class="subxComment">#   slice-equal?(slice, string)</span>
-<span id="L232" class="LineNr"> 232 </span>
-<span id="L233" class="LineNr"> 233 </span><span class="subxFunction">convert-instruction</span>:  <span class="subxComment"># line : (address stream byte), out : (address buffered-file) -&gt; &lt;void&gt;</span>
-<span id="L234" class="LineNr"> 234 </span>    <span class="subxComment"># pseudocode:</span>
-<span id="L235" class="LineNr"> 235 </span>    <span class="subxComment">#   word-slice = next-word</span>
-<span id="L236" class="LineNr"> 236 </span>    <span class="subxComment">#   if (slice-starts-with?(word-slice, '#'))</span>
-<span id="L237" class="LineNr"> 237 </span>    <span class="subxComment">#     write-stream-buffered(out, line)</span>
-<span id="L238" class="LineNr"> 238 </span>    <span class="subxComment">#     return</span>
-<span id="L239" class="LineNr"> 239 </span>    <span class="subxComment">#   if (slice-starts-with?(word-slice, '=='))</span>
-<span id="L240" class="LineNr"> 240 </span>    <span class="subxComment">#     write-stream-buffered(out, line)</span>
-<span id="L241" class="LineNr"> 241 </span>    <span class="subxComment">#     return</span>
-<span id="L242" class="LineNr"> 242 </span>    <span class="subxComment">#</span>
-<span id="L243" class="LineNr"> 243 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L244" class="LineNr"> 244 </span>    55/push-EBP
-<span id="L245" class="LineNr"> 245 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L246" class="LineNr"> 246 </span>    <span class="subxS1Comment"># . save registers</span>
-<span id="L247" class="LineNr"> 247 </span>    51/push-ECX
-<span id="L248" class="LineNr"> 248 </span>    <span class="subxComment"># var word-slice/ECX = {0, 0}</span>
-<span id="L249" class="LineNr"> 249 </span>    68/push  0/imm32/end
-<span id="L250" class="LineNr"> 250 </span>    68/push  0/imm32/start
-<span id="L251" class="LineNr"> 251 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
-<span id="L252" class="LineNr"> 252 </span>    <span class="subxComment"># next-word(line, word-slice)</span>
-<span id="L253" class="LineNr"> 253 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L254" class="LineNr"> 254 </span>    51/push-ECX
-<span id="L255" class="LineNr"> 255 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
-<span id="L256" class="LineNr"> 256 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L257" class="LineNr"> 257 </span>    e8/call  <a href='pack.subx.html#L610'>next-word</a>/disp32
-<span id="L258" class="LineNr"> 258 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L259" class="LineNr"> 259 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L260" class="LineNr"> 260 </span><span class="Constant">$convert-instruction:pass-line-through</span>:
-<span id="L261" class="LineNr"> 261 </span>    <span class="subxComment"># write-stream-buffered(out, line)</span>
-<span id="L262" class="LineNr"> 262 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L263" class="LineNr"> 263 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
-<span id="L264" class="LineNr"> 264 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
-<span id="L265" class="LineNr"> 265 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L266" class="LineNr"> 266 </span>    e8/call  <a href='../072slice.subx.html#L803'>write-stream-buffered</a>/disp32
-<span id="L267" class="LineNr"> 267 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L268" class="LineNr"> 268 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L269" class="LineNr"> 269 </span><span class="Constant">$convert-instruction:end</span>:
-<span id="L270" class="LineNr"> 270 </span>    <span class="subxS1Comment"># . restore registers</span>
-<span id="L271" class="LineNr"> 271 </span>    59/pop-to-ECX
-<span id="L272" class="LineNr"> 272 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L273" class="LineNr"> 273 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L274" class="LineNr"> 274 </span>    5d/pop-to-EBP
-<span id="L275" class="LineNr"> 275 </span>    c3/return
-<span id="L276" class="LineNr"> 276 </span>
-<span id="L277" class="LineNr"> 277 </span><span class="subxTest">test-convert-instruction-passes-comments-through</span>:
-<span id="L278" class="LineNr"> 278 </span>    <span class="subxComment"># if a line starts with '#', pass it along unchanged</span>
-<span id="L279" class="LineNr"> 279 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L280" class="LineNr"> 280 </span>    55/push-EBP
-<span id="L281" class="LineNr"> 281 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L282" class="LineNr"> 282 </span>    <span class="subxComment"># setup</span>
-<span id="L283" class="LineNr"> 283 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
-<span id="L284" class="LineNr"> 284 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L285" class="LineNr"> 285 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L286" class="LineNr"> 286 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L287" class="LineNr"> 287 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L288" class="LineNr"> 288 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L289" class="LineNr"> 289 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L290" class="LineNr"> 290 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
-<span id="L291" class="LineNr"> 291 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L292" class="LineNr"> 292 </span>    b8/copy-to-EAX  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L293" class="LineNr"> 293 </span>    05/add-to-EAX  4/imm32
-<span id="L294" class="LineNr"> 294 </span>    50/push-EAX
-<span id="L295" class="LineNr"> 295 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L296" class="LineNr"> 296 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L297" class="LineNr"> 297 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L298" class="LineNr"> 298 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L299" class="LineNr"> 299 </span>    <span class="subxS1Comment"># . clear-stream(_test-tmp-stream)</span>
-<span id="L300" class="LineNr"> 300 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L301" class="LineNr"> 301 </span>    68/push  <a href='../060read.subx.html#L345'>_test-tmp-stream</a>/imm32
-<span id="L302" class="LineNr"> 302 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L303" class="LineNr"> 303 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L304" class="LineNr"> 304 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L305" class="LineNr"> 305 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L306" class="LineNr"> 306 </span>    <span class="subxComment"># initialize input</span>
-<span id="L307" class="LineNr"> 307 </span>    <span class="subxS1Comment"># . write(_test-tmp-stream, &quot;# abcd&quot;)</span>
-<span id="L308" class="LineNr"> 308 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L309" class="LineNr"> 309 </span>    68/push  <span class="Constant">&quot;# abcd&quot;</span>/imm32
-<span id="L310" class="LineNr"> 310 </span>    68/push  <a href='../060read.subx.html#L345'>_test-tmp-stream</a>/imm32
-<span id="L311" class="LineNr"> 311 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L312" class="LineNr"> 312 </span>    e8/call  <a href='../057write.subx.html#L24'>write</a>/disp32
-<span id="L313" class="LineNr"> 313 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L314" class="LineNr"> 314 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L315" class="LineNr"> 315 </span>    <span class="subxComment"># convert-instruction(_test-tmp-stream, _test-buffered-file)</span>
-<span id="L316" class="LineNr"> 316 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L317" class="LineNr"> 317 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L318" class="LineNr"> 318 </span>    68/push  <a href='../060read.subx.html#L345'>_test-tmp-stream</a>/imm32
-<span id="L319" class="LineNr"> 319 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L320" class="LineNr"> 320 </span>    e8/call  <a href='pack.subx.html#L233'>convert-instruction</a>/disp32
-<span id="L321" class="LineNr"> 321 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L322" class="LineNr"> 322 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L323" class="LineNr"> 323 </span>    <span class="subxComment"># check that the write happened as expected</span>
-<span id="L324" class="LineNr"> 324 </span>    <span class="subxS1Comment"># . flush(_test-buffered-file)</span>
-<span id="L325" class="LineNr"> 325 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L326" class="LineNr"> 326 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L327" class="LineNr"> 327 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L328" class="LineNr"> 328 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
-<span id="L329" class="LineNr"> 329 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L330" class="LineNr"> 330 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L331" class="LineNr"> 331 </span>    <span class="subxS1Comment"># . check-stream-equal(_test-stream, &quot;# abcd&quot;, msg)</span>
-<span id="L332" class="LineNr"> 332 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L333" class="LineNr"> 333 </span>    68/push  <span class="Constant">&quot;F - test-convert-instruction-passes-comments-through&quot;</span>/imm32
-<span id="L334" class="LineNr"> 334 </span>    68/push  <span class="Constant">&quot;# abcd&quot;</span>/imm32
-<span id="L335" class="LineNr"> 335 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L336" class="LineNr"> 336 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L337" class="LineNr"> 337 </span>    e8/call  <a href='../058stream-equal.subx.html#L198'>check-stream-equal</a>/disp32
-<span id="L338" class="LineNr"> 338 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L339" class="LineNr"> 339 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L340" class="LineNr"> 340 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L341" class="LineNr"> 341 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L342" class="LineNr"> 342 </span>    5d/pop-to-EBP
-<span id="L343" class="LineNr"> 343 </span>    c3/return
-<span id="L344" class="LineNr"> 344 </span>
-<span id="L345" class="LineNr"> 345 </span><span class="subxTest">test-convert-instruction-passes-segment-headers-through</span>:
-<span id="L346" class="LineNr"> 346 </span>    <span class="subxComment"># if a line starts with '==', pass it along unchanged</span>
-<span id="L347" class="LineNr"> 347 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L348" class="LineNr"> 348 </span>    55/push-EBP
-<span id="L349" class="LineNr"> 349 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L350" class="LineNr"> 350 </span>    <span class="subxComment"># setup</span>
-<span id="L351" class="LineNr"> 351 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L86" class="LineNr">  86 </span><span class="subxComment"># conceptual hierarchy within a line:</span>
+<span id="L87" class="LineNr">  87 </span><span class="subxComment">#   line = words separated by ' ', maybe followed by comment starting with '#'</span>
+<span id="L88" class="LineNr">  88 </span><span class="subxComment">#   word = name until '/', then 0 or more metadata separated by '/'</span>
+<span id="L89" class="LineNr">  89 </span><span class="subxComment">#</span>
+<span id="L90" class="LineNr">  90 </span><span class="subxComment"># we won't bother saving the internal structure of lines; reparsing should be cheap using three primitives:</span>
+<span id="L91" class="LineNr">  91 </span><span class="subxComment">#   next-token(stream, delim char) -&gt; slice (start, end pointers)</span>
+<span id="L92" class="LineNr">  92 </span><span class="subxComment">#   next-token-from-slice(start, end, delim char) -&gt; slice</span>
+<span id="L93" class="LineNr">  93 </span><span class="subxComment">#   slice-equal?(slice, string)</span>
+<span id="L94" class="LineNr">  94 </span>
+<span id="L95" class="LineNr">  95 </span><span class="subxFunction">convert</span>:  <span class="subxComment"># in : (address buffered-file), out : (address buffered-file) -&gt; &lt;void&gt;</span>
+<span id="L96" class="LineNr">  96 </span>    <span class="subxComment"># pseudocode:</span>
+<span id="L97" class="LineNr">  97 </span>    <span class="subxComment">#   var line = new-stream(512, 1)</span>
+<span id="L98" class="LineNr">  98 </span>    <span class="subxComment">#   var in-code? = false</span>
+<span id="L99" class="LineNr">  99 </span>    <span class="subxComment">#   while true</span>
+<span id="L100" class="LineNr"> 100 </span>    <span class="subxComment">#     clear-stream(line)</span>
+<span id="L101" class="LineNr"> 101 </span>    <span class="subxComment">#     read-line(in, line)</span>
+<span id="L102" class="LineNr"> 102 </span>    <span class="subxComment">#     if (line-&gt;write == 0) break             # end of file</span>
+<span id="L103" class="LineNr"> 103 </span>    <span class="subxComment">#     var word-slice = next-word(line)</span>
+<span id="L104" class="LineNr"> 104 </span>    <span class="subxComment">#     if slice-empty?(word-slice)             # whitespace</span>
+<span id="L105" class="LineNr"> 105 </span>    <span class="subxComment">#       write-stream-buffered(out, line)</span>
+<span id="L106" class="LineNr"> 106 </span>    <span class="subxComment">#     else if (slice-equal?(word-slice, &quot;==&quot;))</span>
+<span id="L107" class="LineNr"> 107 </span>    <span class="subxComment">#       word-slice = next-word(line)</span>
+<span id="L108" class="LineNr"> 108 </span>    <span class="subxComment">#       in-code? = slice-equal?(word-slice, &quot;code&quot;)</span>
+<span id="L109" class="LineNr"> 109 </span>    <span class="subxComment">#       write-stream-buffered(out, line)</span>
+<span id="L110" class="LineNr"> 110 </span>    <span class="subxComment">#     else if (in-code?)</span>
+<span id="L111" class="LineNr"> 111 </span>    <span class="subxComment">#       rewind-stream(line)</span>
+<span id="L112" class="LineNr"> 112 </span>    <span class="subxComment">#       convert-instruction(line, out)</span>
+<span id="L113" class="LineNr"> 113 </span>    <span class="subxComment">#     else</span>
+<span id="L114" class="LineNr"> 114 </span>    <span class="subxComment">#       rewind-stream(line)</span>
+<span id="L115" class="LineNr"> 115 </span>    <span class="subxComment">#       convert-data(line, out)</span>
+<span id="L116" class="LineNr"> 116 </span>    <span class="subxComment">#   flush(out)</span>
+<span id="L117" class="LineNr"> 117 </span>    <span class="subxComment">#</span>
+<span id="L118" class="LineNr"> 118 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L119" class="LineNr"> 119 </span>    55/push-EBP
+<span id="L120" class="LineNr"> 120 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L121" class="LineNr"> 121 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L122" class="LineNr"> 122 </span>    50/push-EAX
+<span id="L123" class="LineNr"> 123 </span>    51/push-ECX
+<span id="L124" class="LineNr"> 124 </span>    52/push-EDX
+<span id="L125" class="LineNr"> 125 </span>    53/push-EBX
+<span id="L126" class="LineNr"> 126 </span>    <span class="subxComment"># var line/ECX : (address stream byte) = stream(512)</span>
+<span id="L127" class="LineNr"> 127 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x200/imm32       <span class="subxComment"># subtract from ESP</span>
+<span id="L128" class="LineNr"> 128 </span>    68/push  0x200/imm32/length
+<span id="L129" class="LineNr"> 129 </span>    68/push  0/imm32/read
+<span id="L130" class="LineNr"> 130 </span>    68/push  0/imm32/write
+<span id="L131" class="LineNr"> 131 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L132" class="LineNr"> 132 </span>    <span class="subxComment"># var word-slice/EDX = {0, 0}</span>
+<span id="L133" class="LineNr"> 133 </span>    68/push  0/imm32/end
+<span id="L134" class="LineNr"> 134 </span>    68/push  0/imm32/curr
+<span id="L135" class="LineNr"> 135 </span>    89/copy                         3/mod/direct    2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EDX</span>
+<span id="L136" class="LineNr"> 136 </span>    <span class="subxComment"># var in-code?/EBX = false</span>
+<span id="L137" class="LineNr"> 137 </span>    68/push  0/imm32/false
+<span id="L138" class="LineNr"> 138 </span>    89/copy                         3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBX</span>
+<span id="L139" class="LineNr"> 139 </span><span class="Constant">$convert:loop</span>:
+<span id="L140" class="LineNr"> 140 </span>    <span class="subxComment"># clear-stream(line)</span>
+<span id="L141" class="LineNr"> 141 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L142" class="LineNr"> 142 </span>    51/push-ECX
+<span id="L143" class="LineNr"> 143 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L144" class="LineNr"> 144 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L145" class="LineNr"> 145 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L146" class="LineNr"> 146 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L147" class="LineNr"> 147 </span>    <span class="subxComment"># read-line(in, line)</span>
+<span id="L148" class="LineNr"> 148 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L149" class="LineNr"> 149 </span>    51/push-ECX
+<span id="L150" class="LineNr"> 150 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L151" class="LineNr"> 151 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L152" class="LineNr"> 152 </span>    e8/call  <a href='../071read-line.subx.html#L16'>read-line</a>/disp32
+<span id="L153" class="LineNr"> 153 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L154" class="LineNr"> 154 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L155" class="LineNr"> 155 </span><span class="Constant">$convert:check0</span>:
+<span id="L156" class="LineNr"> 156 </span>    <span class="subxComment"># if (line-&gt;write == 0) break</span>
+<span id="L157" class="LineNr"> 157 </span>    81          7/subop/compare     0/mod/indirect  1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># compare *ECX</span>
+<span id="L158" class="LineNr"> 158 </span>    0f 84/jump-if-equal  $convert:break/disp32
+<span id="L159" class="Folded"> 159 </span><span class="Folded">+-- 34 lines: #?     # dump current line ---------------------------------------------------------------------------------------------------------------------</span>
+<span id="L193" class="LineNr"> 193 </span>    <span class="subxComment"># next-word(line, word-slice)</span>
+<span id="L194" class="LineNr"> 194 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L195" class="LineNr"> 195 </span>    52/push-EDX
+<span id="L196" class="LineNr"> 196 </span>    51/push-ECX
+<span id="L197" class="LineNr"> 197 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L198" class="LineNr"> 198 </span>    e8/call  <a href='pack.subx.html#L1863'>next-word</a>/disp32
+<span id="L199" class="LineNr"> 199 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L200" class="LineNr"> 200 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L201" class="LineNr"> 201 </span><span class="Constant">$convert:check1</span>:
+<span id="L202" class="LineNr"> 202 </span>    <span class="subxComment"># if (slice-empty?(word-slice)) write-stream-buffered(out, line)</span>
+<span id="L203" class="LineNr"> 203 </span>    <span class="subxS1Comment"># . EAX = slice-empty?(word-slice)</span>
+<span id="L204" class="LineNr"> 204 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L205" class="LineNr"> 205 </span>    52/push-EDX
+<span id="L206" class="LineNr"> 206 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L207" class="LineNr"> 207 </span>    e8/call  <a href='../072slice.subx.html#L17'>slice-empty?</a>/disp32
+<span id="L208" class="LineNr"> 208 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L209" class="LineNr"> 209 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L210" class="LineNr"> 210 </span>    <span class="subxS1Comment"># . if (EAX != 0) write-stream-buffered(out, line)</span>
+<span id="L211" class="LineNr"> 211 </span>    3d/compare-EAX  0/imm32
+<span id="L212" class="LineNr"> 212 </span>    0f 85/jump-if-not-equal  $convert:pass-through/disp32
+<span id="L213" class="LineNr"> 213 </span><span class="Constant">$convert:check2</span>:
+<span id="L214" class="Folded"> 214 </span><span class="Folded">+-- 50 lines: #?     # dump current word ---------------------------------------------------------------------------------------------------------------------</span>
+<span id="L264" class="LineNr"> 264 </span>    <span class="subxComment"># if (slice-equal?(word-slice, &quot;==&quot;))</span>
+<span id="L265" class="LineNr"> 265 </span>    <span class="subxComment">#   word-slice = next-word(line)</span>
+<span id="L266" class="LineNr"> 266 </span>    <span class="subxComment">#   in-code? = slice-equal?(word-slice, &quot;code&quot;)</span>
+<span id="L267" class="LineNr"> 267 </span>    <span class="subxComment">#   write-stream-buffered(out, line)</span>
+<span id="L268" class="LineNr"> 268 </span>    <span class="subxS1Comment"># . EAX = slice-equal?(word-slice, &quot;==&quot;)</span>
+<span id="L269" class="LineNr"> 269 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L270" class="LineNr"> 270 </span>    68/push  <span class="Constant">&quot;==&quot;</span>/imm32
+<span id="L271" class="LineNr"> 271 </span>    52/push-EDX
+<span id="L272" class="LineNr"> 272 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L273" class="LineNr"> 273 </span>    e8/call  <a href='../072slice.subx.html#L99'>slice-equal?</a>/disp32
+<span id="L274" class="LineNr"> 274 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L275" class="LineNr"> 275 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L276" class="LineNr"> 276 </span>    <span class="subxS1Comment"># . if (EAX == 0) goto check3</span>
+<span id="L277" class="LineNr"> 277 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># compare EAX</span>
+<span id="L278" class="LineNr"> 278 </span>    0f 84/jump-if-equal  $convert:check3/disp32
+<span id="L279" class="LineNr"> 279 </span>    <span class="subxS1Comment"># . next-word(line, word-slice)</span>
+<span id="L280" class="LineNr"> 280 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L281" class="LineNr"> 281 </span>    52/push-EDX
+<span id="L282" class="LineNr"> 282 </span>    51/push-ECX
+<span id="L283" class="LineNr"> 283 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L284" class="LineNr"> 284 </span>    e8/call  <a href='pack.subx.html#L1863'>next-word</a>/disp32
+<span id="L285" class="LineNr"> 285 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L286" class="LineNr"> 286 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L287" class="Folded"> 287 </span><span class="Folded">+-- 50 lines: #?     # dump segment name ---------------------------------------------------------------------------------------------------------------------</span>
+<span id="L337" class="LineNr"> 337 </span>    <span class="subxS1Comment"># . in-code? = slice-equal?(word-slice, &quot;code&quot;)</span>
+<span id="L338" class="LineNr"> 338 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L339" class="LineNr"> 339 </span>    68/push  <span class="Constant">&quot;code&quot;</span>/imm32
+<span id="L340" class="LineNr"> 340 </span>    52/push-EDX
+<span id="L341" class="LineNr"> 341 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L342" class="LineNr"> 342 </span>    e8/call  <a href='../072slice.subx.html#L99'>slice-equal?</a>/disp32
+<span id="L343" class="LineNr"> 343 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L344" class="LineNr"> 344 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L345" class="LineNr"> 345 </span>    <span class="subxS2Comment"># . . in-code? = EAX</span>
+<span id="L346" class="LineNr"> 346 </span>    89/copy                         3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to EBX</span>
+<span id="L347" class="LineNr"> 347 </span>    <span class="subxS1Comment"># . goto pass-through</span>
+<span id="L348" class="LineNr"> 348 </span>    eb/jump  $convert:pass-through/disp8
+<span id="L349" class="LineNr"> 349 </span><span class="Constant">$convert:check3</span>:
+<span id="L350" class="LineNr"> 350 </span>    <span class="subxComment"># else rewind-stream(line)</span>
+<span id="L351" class="LineNr"> 351 </span>    <span class="subxS1Comment"># . rewind-stream(line)</span>
 <span id="L352" class="LineNr"> 352 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L353" class="LineNr"> 353 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L353" class="LineNr"> 353 </span>    51/push-ECX
 <span id="L354" class="LineNr"> 354 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L355" class="LineNr"> 355 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L355" class="LineNr"> 355 </span>    e8/call  <a href='../055stream.subx.html#L55'>rewind-stream</a>/disp32
 <span id="L356" class="LineNr"> 356 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L357" class="LineNr"> 357 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L358" class="LineNr"> 358 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
-<span id="L359" class="LineNr"> 359 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L360" class="LineNr"> 360 </span>    b8/copy-to-EAX  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L361" class="LineNr"> 361 </span>    05/add-to-EAX  4/imm32
-<span id="L362" class="LineNr"> 362 </span>    50/push-EAX
-<span id="L363" class="LineNr"> 363 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L364" class="LineNr"> 364 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L365" class="LineNr"> 365 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L366" class="LineNr"> 366 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L367" class="LineNr"> 367 </span>    <span class="subxS1Comment"># . clear-stream(_test-tmp-stream)</span>
-<span id="L368" class="LineNr"> 368 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L369" class="LineNr"> 369 </span>    68/push  <a href='../060read.subx.html#L345'>_test-tmp-stream</a>/imm32
-<span id="L370" class="LineNr"> 370 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L371" class="LineNr"> 371 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L372" class="LineNr"> 372 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L373" class="LineNr"> 373 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L374" class="LineNr"> 374 </span>    <span class="subxComment"># initialize input</span>
-<span id="L375" class="LineNr"> 375 </span>    <span class="subxS1Comment"># . write(_test-tmp-stream, &quot;== abcd&quot;)</span>
-<span id="L376" class="LineNr"> 376 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L377" class="LineNr"> 377 </span>    68/push  <span class="Constant">&quot;== abcd&quot;</span>/imm32
-<span id="L378" class="LineNr"> 378 </span>    68/push  <a href='../060read.subx.html#L345'>_test-tmp-stream</a>/imm32
-<span id="L379" class="LineNr"> 379 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L380" class="LineNr"> 380 </span>    e8/call  <a href='../057write.subx.html#L24'>write</a>/disp32
-<span id="L381" class="LineNr"> 381 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L382" class="LineNr"> 382 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L383" class="LineNr"> 383 </span>    <span class="subxComment"># convert-instruction(_test-tmp-stream, _test-buffered-file)</span>
-<span id="L384" class="LineNr"> 384 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L385" class="LineNr"> 385 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L386" class="LineNr"> 386 </span>    68/push  <a href='../060read.subx.html#L345'>_test-tmp-stream</a>/imm32
-<span id="L387" class="LineNr"> 387 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L388" class="LineNr"> 388 </span>    e8/call  <a href='pack.subx.html#L233'>convert-instruction</a>/disp32
-<span id="L389" class="LineNr"> 389 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L390" class="LineNr"> 390 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L391" class="LineNr"> 391 </span>    <span class="subxComment"># check that the write happened as expected</span>
-<span id="L392" class="LineNr"> 392 </span>    <span class="subxS1Comment"># . flush(_test-buffered-file)</span>
-<span id="L393" class="LineNr"> 393 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L394" class="LineNr"> 394 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L395" class="LineNr"> 395 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L396" class="LineNr"> 396 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
-<span id="L397" class="LineNr"> 397 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L398" class="LineNr"> 398 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L399" class="LineNr"> 399 </span>    <span class="subxS1Comment"># . check-stream-equal(_test-stream, &quot;== abcd&quot;, msg)</span>
-<span id="L400" class="LineNr"> 400 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L401" class="LineNr"> 401 </span>    68/push  <span class="Constant">&quot;F - test-convert-instruction-passes-segment-headers-through&quot;</span>/imm32
-<span id="L402" class="LineNr"> 402 </span>    68/push  <span class="Constant">&quot;== abcd&quot;</span>/imm32
-<span id="L403" class="LineNr"> 403 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L404" class="LineNr"> 404 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L405" class="LineNr"> 405 </span>    e8/call  <a href='../058stream-equal.subx.html#L198'>check-stream-equal</a>/disp32
-<span id="L406" class="LineNr"> 406 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L407" class="LineNr"> 407 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L408" class="LineNr"> 408 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L409" class="LineNr"> 409 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L410" class="LineNr"> 410 </span>    5d/pop-to-EBP
-<span id="L411" class="LineNr"> 411 </span>    c3/return
-<span id="L412" class="LineNr"> 412 </span>
-<span id="L413" class="LineNr"> 413 </span><span class="subxTest">test-convert-instruction-passes-empty-lines-through</span>:
-<span id="L414" class="LineNr"> 414 </span>    <span class="subxComment"># if a line is empty, pass it along unchanged</span>
-<span id="L415" class="LineNr"> 415 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L416" class="LineNr"> 416 </span>    55/push-EBP
-<span id="L417" class="LineNr"> 417 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L418" class="LineNr"> 418 </span>    <span class="subxComment"># setup</span>
-<span id="L419" class="LineNr"> 419 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
-<span id="L420" class="LineNr"> 420 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L421" class="LineNr"> 421 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L422" class="LineNr"> 422 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L423" class="LineNr"> 423 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L424" class="LineNr"> 424 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L425" class="LineNr"> 425 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L426" class="LineNr"> 426 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
-<span id="L427" class="LineNr"> 427 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L428" class="LineNr"> 428 </span>    b8/copy-to-EAX  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L429" class="LineNr"> 429 </span>    05/add-to-EAX  4/imm32
-<span id="L430" class="LineNr"> 430 </span>    50/push-EAX
-<span id="L431" class="LineNr"> 431 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L432" class="LineNr"> 432 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L433" class="LineNr"> 433 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L434" class="LineNr"> 434 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L435" class="LineNr"> 435 </span>    <span class="subxS1Comment"># . clear-stream(_test-tmp-stream)</span>
-<span id="L436" class="LineNr"> 436 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L437" class="LineNr"> 437 </span>    68/push  <a href='../060read.subx.html#L345'>_test-tmp-stream</a>/imm32
-<span id="L438" class="LineNr"> 438 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L439" class="LineNr"> 439 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L440" class="LineNr"> 440 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L441" class="LineNr"> 441 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L442" class="LineNr"> 442 </span>    <span class="subxComment"># write nothing to input</span>
-<span id="L443" class="LineNr"> 443 </span>    <span class="subxComment"># convert-instruction(_test-tmp-stream, _test-buffered-file)</span>
-<span id="L444" class="LineNr"> 444 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L445" class="LineNr"> 445 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L446" class="LineNr"> 446 </span>    68/push  <a href='../060read.subx.html#L345'>_test-tmp-stream</a>/imm32
-<span id="L447" class="LineNr"> 447 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L448" class="LineNr"> 448 </span>    e8/call  <a href='pack.subx.html#L233'>convert-instruction</a>/disp32
-<span id="L449" class="LineNr"> 449 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L450" class="LineNr"> 450 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L451" class="LineNr"> 451 </span>    <span class="subxComment"># check that the write happened as expected</span>
-<span id="L452" class="LineNr"> 452 </span>    <span class="subxS1Comment"># . flush(_test-buffered-file)</span>
-<span id="L453" class="LineNr"> 453 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L454" class="LineNr"> 454 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L455" class="LineNr"> 455 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L456" class="LineNr"> 456 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
-<span id="L457" class="LineNr"> 457 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L458" class="LineNr"> 458 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L459" class="LineNr"> 459 </span>    <span class="subxS1Comment"># . check-stream-equal(_test-stream, &quot;&quot;, msg)</span>
-<span id="L460" class="LineNr"> 460 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L461" class="LineNr"> 461 </span>    68/push  <span class="Constant">&quot;F - test-convert-instruction-passes-empty-lines-through&quot;</span>/imm32
-<span id="L462" class="LineNr"> 462 </span>    68/push  <span class="Constant">&quot;&quot;</span>/imm32
-<span id="L463" class="LineNr"> 463 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L464" class="LineNr"> 464 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L465" class="LineNr"> 465 </span>    e8/call  <a href='../058stream-equal.subx.html#L198'>check-stream-equal</a>/disp32
-<span id="L466" class="LineNr"> 466 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L467" class="LineNr"> 467 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L468" class="LineNr"> 468 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L469" class="LineNr"> 469 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L470" class="LineNr"> 470 </span>    5d/pop-to-EBP
-<span id="L471" class="LineNr"> 471 </span>    c3/return
-<span id="L472" class="LineNr"> 472 </span>
-<span id="L473" class="LineNr"> 473 </span><span class="subxTest">test-convert-instruction-passes-lines-with-just-whitespace-through</span>:
-<span id="L474" class="LineNr"> 474 </span>    <span class="subxComment"># if a line is empty, pass it along unchanged</span>
-<span id="L475" class="LineNr"> 475 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L476" class="LineNr"> 476 </span>    55/push-EBP
-<span id="L477" class="LineNr"> 477 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L478" class="LineNr"> 478 </span>    <span class="subxComment"># setup</span>
-<span id="L479" class="LineNr"> 479 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
-<span id="L480" class="LineNr"> 480 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L481" class="LineNr"> 481 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L482" class="LineNr"> 482 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L483" class="LineNr"> 483 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L484" class="LineNr"> 484 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L485" class="LineNr"> 485 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L486" class="LineNr"> 486 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
-<span id="L487" class="LineNr"> 487 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L488" class="LineNr"> 488 </span>    b8/copy-to-EAX  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L489" class="LineNr"> 489 </span>    05/add-to-EAX  4/imm32
-<span id="L490" class="LineNr"> 490 </span>    50/push-EAX
-<span id="L491" class="LineNr"> 491 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L492" class="LineNr"> 492 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L493" class="LineNr"> 493 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L494" class="LineNr"> 494 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L495" class="LineNr"> 495 </span>    <span class="subxS1Comment"># . clear-stream(_test-tmp-stream)</span>
-<span id="L496" class="LineNr"> 496 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L497" class="LineNr"> 497 </span>    68/push  <a href='../060read.subx.html#L345'>_test-tmp-stream</a>/imm32
-<span id="L498" class="LineNr"> 498 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L499" class="LineNr"> 499 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L500" class="LineNr"> 500 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L501" class="LineNr"> 501 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L502" class="LineNr"> 502 </span>    <span class="subxComment"># initialize input</span>
-<span id="L503" class="LineNr"> 503 </span>    <span class="subxS1Comment"># . write(_test-tmp-stream, &quot;    &quot;)</span>
-<span id="L504" class="LineNr"> 504 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L505" class="LineNr"> 505 </span>    68/push  <span class="Constant">&quot;    &quot;</span>/imm32
-<span id="L506" class="LineNr"> 506 </span>    68/push  <a href='../060read.subx.html#L345'>_test-tmp-stream</a>/imm32
-<span id="L507" class="LineNr"> 507 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L508" class="LineNr"> 508 </span>    e8/call  <a href='../057write.subx.html#L24'>write</a>/disp32
-<span id="L509" class="LineNr"> 509 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L510" class="LineNr"> 510 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L511" class="LineNr"> 511 </span>    <span class="subxComment"># convert-instruction(_test-tmp-stream, _test-buffered-file)</span>
-<span id="L512" class="LineNr"> 512 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L513" class="LineNr"> 513 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L514" class="LineNr"> 514 </span>    68/push  <a href='../060read.subx.html#L345'>_test-tmp-stream</a>/imm32
-<span id="L515" class="LineNr"> 515 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L516" class="LineNr"> 516 </span>    e8/call  <a href='pack.subx.html#L233'>convert-instruction</a>/disp32
-<span id="L517" class="LineNr"> 517 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L518" class="LineNr"> 518 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L519" class="LineNr"> 519 </span>    <span class="subxComment"># check that the write happened as expected</span>
-<span id="L520" class="LineNr"> 520 </span>    <span class="subxS1Comment"># . flush(_test-buffered-file)</span>
-<span id="L521" class="LineNr"> 521 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L522" class="LineNr"> 522 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L523" class="LineNr"> 523 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L524" class="LineNr"> 524 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
-<span id="L525" class="LineNr"> 525 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L526" class="LineNr"> 526 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L527" class="LineNr"> 527 </span>    <span class="subxS1Comment"># . check-stream-equal(_test-stream, &quot;    &quot;, msg)</span>
-<span id="L528" class="LineNr"> 528 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L529" class="LineNr"> 529 </span>    68/push  <span class="Constant">&quot;F - test-convert-instruction-passes-with-just-whitespace-through&quot;</span>/imm32
-<span id="L530" class="LineNr"> 530 </span>    68/push  <span class="Constant">&quot;    &quot;</span>/imm32
-<span id="L531" class="LineNr"> 531 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L532" class="LineNr"> 532 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L533" class="LineNr"> 533 </span>    e8/call  <a href='../058stream-equal.subx.html#L198'>check-stream-equal</a>/disp32
-<span id="L534" class="LineNr"> 534 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L535" class="LineNr"> 535 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L536" class="LineNr"> 536 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L537" class="LineNr"> 537 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L538" class="LineNr"> 538 </span>    5d/pop-to-EBP
-<span id="L539" class="LineNr"> 539 </span>    c3/return
-<span id="L540" class="LineNr"> 540 </span>
-<span id="L541" class="LineNr"> 541 </span><span class="subxTest">test-convert-instruction-passes-labels-through</span>:
-<span id="L542" class="LineNr"> 542 </span>    <span class="subxComment"># if the first word ends with ':', pass along the entire line unchanged</span>
-<span id="L543" class="LineNr"> 543 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L544" class="LineNr"> 544 </span>    55/push-EBP
-<span id="L545" class="LineNr"> 545 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L546" class="LineNr"> 546 </span>    <span class="subxComment"># setup</span>
-<span id="L547" class="LineNr"> 547 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L358" class="LineNr"> 358 </span>    <span class="subxComment"># if (in-code? != 0) convert-instruction(line, out)</span>
+<span id="L359" class="LineNr"> 359 </span>    81          7/subop/compare     3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># compare EBX</span>
+<span id="L360" class="LineNr"> 360 </span>    74/jump-if-equal  $convert:data/disp8
+<span id="L361" class="LineNr"> 361 </span><span class="Constant">$convert:code</span>:
+<span id="L362" class="LineNr"> 362 </span>    <span class="subxS1Comment"># . convert-instruction(line, out)</span>
+<span id="L363" class="LineNr"> 363 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L364" class="LineNr"> 364 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L365" class="LineNr"> 365 </span>    51/push-ECX
+<span id="L366" class="LineNr"> 366 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L367" class="LineNr"> 367 </span>    e8/call  <a href='pack.subx.html#L1578'>convert-instruction</a>/disp32
+<span id="L368" class="LineNr"> 368 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L369" class="LineNr"> 369 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L370" class="LineNr"> 370 </span>    <span class="subxS1Comment"># . loop</span>
+<span id="L371" class="LineNr"> 371 </span>    e9/jump  $convert:loop/disp32
+<span id="L372" class="LineNr"> 372 </span><span class="Constant">$convert:data</span>:
+<span id="L373" class="LineNr"> 373 </span>    <span class="subxComment"># else convert-data(line, out)</span>
+<span id="L374" class="LineNr"> 374 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L375" class="LineNr"> 375 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L376" class="LineNr"> 376 </span>    51/push-ECX
+<span id="L377" class="LineNr"> 377 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L378" class="LineNr"> 378 </span>    e8/call  <a href='pack.subx.html#L807'>convert-data</a>/disp32
+<span id="L379" class="LineNr"> 379 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L380" class="LineNr"> 380 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L381" class="LineNr"> 381 </span>    <span class="subxS1Comment"># . loop</span>
+<span id="L382" class="LineNr"> 382 </span>    e9/jump  $convert:loop/disp32
+<span id="L383" class="LineNr"> 383 </span><span class="Constant">$convert:pass-through</span>:
+<span id="L384" class="LineNr"> 384 </span>    <span class="subxComment"># write-stream-buffered(out, line)</span>
+<span id="L385" class="LineNr"> 385 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L386" class="LineNr"> 386 </span>    51/push-ECX
+<span id="L387" class="LineNr"> 387 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L388" class="LineNr"> 388 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L389" class="LineNr"> 389 </span>    e8/call  <a href='../072slice.subx.html#L803'>write-stream-buffered</a>/disp32
+<span id="L390" class="LineNr"> 390 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L391" class="LineNr"> 391 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L392" class="LineNr"> 392 </span>    <span class="subxS1Comment"># . loop</span>
+<span id="L393" class="LineNr"> 393 </span>    e9/jump  $convert:loop/disp32
+<span id="L394" class="LineNr"> 394 </span><span class="Constant">$convert:break</span>:
+<span id="L395" class="LineNr"> 395 </span>    <span class="subxComment"># flush(out)</span>
+<span id="L396" class="LineNr"> 396 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L397" class="LineNr"> 397 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L398" class="LineNr"> 398 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L399" class="LineNr"> 399 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
+<span id="L400" class="LineNr"> 400 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L401" class="LineNr"> 401 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L402" class="LineNr"> 402 </span><span class="Constant">$convert:end</span>:
+<span id="L403" class="LineNr"> 403 </span>    <span class="subxS1Comment"># . reclaim locals</span>
+<span id="L404" class="LineNr"> 404 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x218/imm32       <span class="subxComment"># add to ESP</span>
+<span id="L405" class="LineNr"> 405 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L406" class="LineNr"> 406 </span>    5b/pop-to-EBX
+<span id="L407" class="LineNr"> 407 </span>    5a/pop-to-EDX
+<span id="L408" class="LineNr"> 408 </span>    59/pop-to-ECX
+<span id="L409" class="LineNr"> 409 </span>    58/pop-to-EAX
+<span id="L410" class="LineNr"> 410 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L411" class="LineNr"> 411 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L412" class="LineNr"> 412 </span>    5d/pop-to-EBP
+<span id="L413" class="LineNr"> 413 </span>    c3/return
+<span id="L414" class="LineNr"> 414 </span>
+<span id="L415" class="LineNr"> 415 </span><span class="subxTest">test-convert-passes-empty-lines-through</span>:
+<span id="L416" class="LineNr"> 416 </span>    <span class="subxComment"># if a line is empty, pass it along unchanged</span>
+<span id="L417" class="LineNr"> 417 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L418" class="LineNr"> 418 </span>    55/push-EBP
+<span id="L419" class="LineNr"> 419 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L420" class="LineNr"> 420 </span>    <span class="subxComment"># setup</span>
+<span id="L421" class="LineNr"> 421 </span>    <span class="subxS1Comment"># . clear-stream(_test-input-stream)</span>
+<span id="L422" class="LineNr"> 422 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L423" class="LineNr"> 423 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L424" class="LineNr"> 424 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L425" class="LineNr"> 425 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L426" class="LineNr"> 426 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L427" class="LineNr"> 427 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L428" class="LineNr"> 428 </span>    <span class="subxS1Comment"># . clear-stream(_test-input-buffered-file+4)</span>
+<span id="L429" class="LineNr"> 429 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L430" class="LineNr"> 430 </span>    b8/copy-to-EAX  <a href='pack.subx.html#L3323'>_test-input-buffered-file</a>/imm32
+<span id="L431" class="LineNr"> 431 </span>    05/add-to-EAX  4/imm32
+<span id="L432" class="LineNr"> 432 </span>    50/push-EAX
+<span id="L433" class="LineNr"> 433 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L434" class="LineNr"> 434 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L435" class="LineNr"> 435 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L436" class="LineNr"> 436 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L437" class="LineNr"> 437 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-stream)</span>
+<span id="L438" class="LineNr"> 438 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L439" class="LineNr"> 439 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L440" class="LineNr"> 440 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L441" class="LineNr"> 441 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L442" class="LineNr"> 442 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L443" class="LineNr"> 443 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L444" class="LineNr"> 444 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-buffered-file+4)</span>
+<span id="L445" class="LineNr"> 445 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L446" class="LineNr"> 446 </span>    b8/copy-to-EAX  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L447" class="LineNr"> 447 </span>    05/add-to-EAX  4/imm32
+<span id="L448" class="LineNr"> 448 </span>    50/push-EAX
+<span id="L449" class="LineNr"> 449 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L450" class="LineNr"> 450 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L451" class="LineNr"> 451 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L452" class="LineNr"> 452 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L453" class="LineNr"> 453 </span>    <span class="subxComment"># write nothing to input</span>
+<span id="L454" class="LineNr"> 454 </span>    <span class="subxComment"># convert(_test-input-buffered-file, _test-output-buffered-file)</span>
+<span id="L455" class="LineNr"> 455 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L456" class="LineNr"> 456 </span>    68/push  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L457" class="LineNr"> 457 </span>    68/push  <a href='pack.subx.html#L3323'>_test-input-buffered-file</a>/imm32
+<span id="L458" class="LineNr"> 458 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L459" class="LineNr"> 459 </span>    e8/call  <a href='pack.subx.html#L95'>convert</a>/disp32
+<span id="L460" class="LineNr"> 460 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L461" class="LineNr"> 461 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L462" class="LineNr"> 462 </span>    <span class="subxComment"># check that the line just passed through</span>
+<span id="L463" class="LineNr"> 463 </span>    <span class="subxS1Comment"># . flush(_test-output-buffered-file)</span>
+<span id="L464" class="LineNr"> 464 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L465" class="LineNr"> 465 </span>    68/push  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L466" class="LineNr"> 466 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L467" class="LineNr"> 467 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
+<span id="L468" class="LineNr"> 468 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L469" class="LineNr"> 469 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L470" class="LineNr"> 470 </span>    <span class="subxS1Comment"># . check-stream-equal(_test-output-stream, &quot;&quot;, msg)</span>
+<span id="L471" class="LineNr"> 471 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L472" class="LineNr"> 472 </span>    68/push  <span class="Constant">&quot;F - test-convert-passes-empty-lines-through&quot;</span>/imm32
+<span id="L473" class="LineNr"> 473 </span>    68/push  <span class="Constant">&quot;&quot;</span>/imm32
+<span id="L474" class="LineNr"> 474 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L475" class="LineNr"> 475 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L476" class="LineNr"> 476 </span>    e8/call  <a href='../058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
+<span id="L477" class="LineNr"> 477 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L478" class="LineNr"> 478 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L479" class="LineNr"> 479 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L480" class="LineNr"> 480 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L481" class="LineNr"> 481 </span>    5d/pop-to-EBP
+<span id="L482" class="LineNr"> 482 </span>    c3/return
+<span id="L483" class="LineNr"> 483 </span>
+<span id="L484" class="LineNr"> 484 </span><span class="subxTest">test-convert-passes-lines-with-just-whitespace-through</span>:
+<span id="L485" class="LineNr"> 485 </span>    <span class="subxComment"># if a line is empty, pass it along unchanged</span>
+<span id="L486" class="LineNr"> 486 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L487" class="LineNr"> 487 </span>    55/push-EBP
+<span id="L488" class="LineNr"> 488 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L489" class="LineNr"> 489 </span>    <span class="subxComment"># setup</span>
+<span id="L490" class="LineNr"> 490 </span>    <span class="subxS1Comment"># . clear-stream(_test-input-stream)</span>
+<span id="L491" class="LineNr"> 491 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L492" class="LineNr"> 492 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L493" class="LineNr"> 493 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L494" class="LineNr"> 494 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L495" class="LineNr"> 495 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L496" class="LineNr"> 496 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L497" class="LineNr"> 497 </span>    <span class="subxS1Comment"># . clear-stream(_test-input-buffered-file+4)</span>
+<span id="L498" class="LineNr"> 498 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L499" class="LineNr"> 499 </span>    b8/copy-to-EAX  <a href='pack.subx.html#L3323'>_test-input-buffered-file</a>/imm32
+<span id="L500" class="LineNr"> 500 </span>    05/add-to-EAX  4/imm32
+<span id="L501" class="LineNr"> 501 </span>    50/push-EAX
+<span id="L502" class="LineNr"> 502 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L503" class="LineNr"> 503 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L504" class="LineNr"> 504 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L505" class="LineNr"> 505 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L506" class="LineNr"> 506 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-stream)</span>
+<span id="L507" class="LineNr"> 507 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L508" class="LineNr"> 508 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L509" class="LineNr"> 509 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L510" class="LineNr"> 510 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L511" class="LineNr"> 511 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L512" class="LineNr"> 512 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L513" class="LineNr"> 513 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-buffered-file+4)</span>
+<span id="L514" class="LineNr"> 514 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L515" class="LineNr"> 515 </span>    b8/copy-to-EAX  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L516" class="LineNr"> 516 </span>    05/add-to-EAX  4/imm32
+<span id="L517" class="LineNr"> 517 </span>    50/push-EAX
+<span id="L518" class="LineNr"> 518 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L519" class="LineNr"> 519 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L520" class="LineNr"> 520 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L521" class="LineNr"> 521 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L522" class="LineNr"> 522 </span>    <span class="subxComment"># initialize input</span>
+<span id="L523" class="LineNr"> 523 </span>    <span class="subxS1Comment"># . write(_test-input-stream, &quot;    &quot;)</span>
+<span id="L524" class="LineNr"> 524 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L525" class="LineNr"> 525 </span>    68/push  <span class="Constant">&quot;    &quot;</span>/imm32
+<span id="L526" class="LineNr"> 526 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L527" class="LineNr"> 527 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L528" class="LineNr"> 528 </span>    e8/call  <a href='../057write.subx.html#L24'>write</a>/disp32
+<span id="L529" class="LineNr"> 529 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L530" class="LineNr"> 530 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L531" class="LineNr"> 531 </span>    <span class="subxComment"># convert(_test-input-buffered-file, _test-output-buffered-file)</span>
+<span id="L532" class="LineNr"> 532 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L533" class="LineNr"> 533 </span>    68/push  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L534" class="LineNr"> 534 </span>    68/push  <a href='pack.subx.html#L3323'>_test-input-buffered-file</a>/imm32
+<span id="L535" class="LineNr"> 535 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L536" class="LineNr"> 536 </span>    e8/call  <a href='pack.subx.html#L95'>convert</a>/disp32
+<span id="L537" class="LineNr"> 537 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L538" class="LineNr"> 538 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L539" class="LineNr"> 539 </span>    <span class="subxComment"># check that the line just passed through</span>
+<span id="L540" class="LineNr"> 540 </span>    <span class="subxS1Comment"># . flush(_test-output-buffered-file)</span>
+<span id="L541" class="LineNr"> 541 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L542" class="LineNr"> 542 </span>    68/push  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L543" class="LineNr"> 543 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L544" class="LineNr"> 544 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
+<span id="L545" class="LineNr"> 545 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L546" class="LineNr"> 546 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L547" class="LineNr"> 547 </span>    <span class="subxS1Comment"># . check-next-stream-line-equal(_test-output-stream, &quot;    &quot;, msg)</span>
 <span id="L548" class="LineNr"> 548 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L549" class="LineNr"> 549 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L550" class="LineNr"> 550 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L551" class="LineNr"> 551 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L552" class="LineNr"> 552 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L553" class="LineNr"> 553 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L554" class="LineNr"> 554 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
-<span id="L555" class="LineNr"> 555 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L556" class="LineNr"> 556 </span>    b8/copy-to-EAX  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L557" class="LineNr"> 557 </span>    05/add-to-EAX  4/imm32
-<span id="L558" class="LineNr"> 558 </span>    50/push-EAX
-<span id="L559" class="LineNr"> 559 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L560" class="LineNr"> 560 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L561" class="LineNr"> 561 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L562" class="LineNr"> 562 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L563" class="LineNr"> 563 </span>    <span class="subxS1Comment"># . clear-stream(_test-tmp-stream)</span>
-<span id="L564" class="LineNr"> 564 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L565" class="LineNr"> 565 </span>    68/push  <a href='../060read.subx.html#L345'>_test-tmp-stream</a>/imm32
-<span id="L566" class="LineNr"> 566 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L567" class="LineNr"> 567 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L568" class="LineNr"> 568 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L569" class="LineNr"> 569 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L570" class="LineNr"> 570 </span>    <span class="subxComment"># initialize input</span>
-<span id="L571" class="LineNr"> 571 </span>    <span class="subxS1Comment"># . write(_test-tmp-stream, &quot;ab: # cd&quot;)</span>
-<span id="L572" class="LineNr"> 572 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L573" class="LineNr"> 573 </span>    68/push  <span class="Constant">&quot;ab: # cd&quot;</span>/imm32
-<span id="L574" class="LineNr"> 574 </span>    68/push  <a href='../060read.subx.html#L345'>_test-tmp-stream</a>/imm32
-<span id="L575" class="LineNr"> 575 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L576" class="LineNr"> 576 </span>    e8/call  <a href='../057write.subx.html#L24'>write</a>/disp32
-<span id="L577" class="LineNr"> 577 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L578" class="LineNr"> 578 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L579" class="LineNr"> 579 </span>    <span class="subxComment"># convert-instruction(_test-tmp-stream, _test-buffered-file)</span>
-<span id="L580" class="LineNr"> 580 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L581" class="LineNr"> 581 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L582" class="LineNr"> 582 </span>    68/push  <a href='../060read.subx.html#L345'>_test-tmp-stream</a>/imm32
-<span id="L583" class="LineNr"> 583 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L584" class="LineNr"> 584 </span>    e8/call  <a href='pack.subx.html#L233'>convert-instruction</a>/disp32
-<span id="L585" class="LineNr"> 585 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L586" class="LineNr"> 586 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L587" class="LineNr"> 587 </span>    <span class="subxComment"># check that the write happened as expected</span>
-<span id="L588" class="LineNr"> 588 </span>    <span class="subxS1Comment"># . flush(_test-buffered-file)</span>
-<span id="L589" class="LineNr"> 589 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L590" class="LineNr"> 590 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L591" class="LineNr"> 591 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L592" class="LineNr"> 592 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
-<span id="L593" class="LineNr"> 593 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L594" class="LineNr"> 594 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L595" class="LineNr"> 595 </span>    <span class="subxS1Comment"># . check-stream-equal(_test-stream, &quot;ab: # cd&quot;, msg)</span>
-<span id="L596" class="LineNr"> 596 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L597" class="LineNr"> 597 </span>    68/push  <span class="Constant">&quot;F - test-convert-instruction-passes-labels-through&quot;</span>/imm32
-<span id="L598" class="LineNr"> 598 </span>    68/push  <span class="Constant">&quot;ab: # cd&quot;</span>/imm32
-<span id="L599" class="LineNr"> 599 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L600" class="LineNr"> 600 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L601" class="LineNr"> 601 </span>    e8/call  <a href='../058stream-equal.subx.html#L198'>check-stream-equal</a>/disp32
-<span id="L602" class="LineNr"> 602 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L603" class="LineNr"> 603 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L604" class="LineNr"> 604 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L605" class="LineNr"> 605 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L606" class="LineNr"> 606 </span>    5d/pop-to-EBP
-<span id="L607" class="LineNr"> 607 </span>    c3/return
-<span id="L608" class="LineNr"> 608 </span>
-<span id="L609" class="LineNr"> 609 </span><span class="subxComment"># (re)compute the bounds of the next word in the line</span>
-<span id="L610" class="LineNr"> 610 </span><span class="subxFunction">next-word</span>:  <span class="subxComment"># line : (address stream byte), out : (address slice)</span>
-<span id="L611" class="LineNr"> 611 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L612" class="LineNr"> 612 </span>    55/push-EBP
-<span id="L613" class="LineNr"> 613 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L614" class="LineNr"> 614 </span>    <span class="subxS1Comment"># . save registers</span>
-<span id="L615" class="LineNr"> 615 </span>    50/push-EAX
-<span id="L616" class="LineNr"> 616 </span>    51/push-ECX
-<span id="L617" class="LineNr"> 617 </span>    56/push-ESI
-<span id="L618" class="LineNr"> 618 </span>    57/push-EDI
-<span id="L619" class="LineNr"> 619 </span>    <span class="subxComment"># ESI = line</span>
-<span id="L620" class="LineNr"> 620 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
-<span id="L621" class="LineNr"> 621 </span>    <span class="subxComment"># EDI = out</span>
-<span id="L622" class="LineNr"> 622 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          7/r32/EDI   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDI</span>
-<span id="L623" class="LineNr"> 623 </span>    <span class="subxComment"># skip-chars-matching(line, ' ')</span>
-<span id="L624" class="LineNr"> 624 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L625" class="LineNr"> 625 </span>    68/push  0x20/imm32/space
-<span id="L626" class="LineNr"> 626 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
-<span id="L627" class="LineNr"> 627 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L628" class="LineNr"> 628 </span>    e8/call  <a href='../073next-token.subx.html#L346'>skip-chars-matching</a>/disp32
-<span id="L629" class="LineNr"> 629 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L630" class="LineNr"> 630 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L631" class="LineNr"> 631 </span>    <span class="subxComment"># out-&gt;start = &amp;line-&gt;data[line-&gt;read]</span>
-<span id="L632" class="LineNr"> 632 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESI+4) to ECX</span>
-<span id="L633" class="LineNr"> 633 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  1/index/ECX  <span class="Normal"> . </span>          0/r32/EAX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy ESI+ECX+12 to EAX</span>
-<span id="L634" class="LineNr"> 634 </span>    89/copy                         0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to *EDI</span>
-<span id="L635" class="LineNr"> 635 </span>    <span class="subxComment"># if (line-&gt;data[line-&gt;read] == '#') out-&gt;end = &amp;line-&gt;data[line-&gt;write]), skip rest of stream and return</span>
-<span id="L636" class="LineNr"> 636 </span>    <span class="subxS1Comment"># . EAX = line-&gt;data[line-&gt;read]</span>
-<span id="L637" class="LineNr"> 637 </span>    31/xor                          3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EAX</span>
-<span id="L638" class="LineNr"> 638 </span>    8a/copy-byte                    1/mod/*+disp8   4/rm32/sib    6/base/ESI  1/index/ECX  <span class="Normal"> . </span>          0/r32/AL    0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *(ESI+ECX+12) to AL</span>
-<span id="L639" class="LineNr"> 639 </span>    <span class="subxS1Comment"># . compare</span>
-<span id="L640" class="LineNr"> 640 </span>    3d/compare-EAX-with  0x23/imm32/pound
-<span id="L641" class="LineNr"> 641 </span>    75/jump-if-not-equal  $next-word:not-comment/disp8
-<span id="L642" class="LineNr"> 642 </span>    <span class="subxS1Comment"># . out-&gt;end = &amp;line-&gt;data[line-&gt;write]</span>
-<span id="L643" class="LineNr"> 643 </span>    8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ESI to EAX</span>
-<span id="L644" class="LineNr"> 644 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  0/index/EAX  <span class="Normal"> . </span>          0/r32/EAX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy ESI+EAX+12 to EAX</span>
-<span id="L645" class="LineNr"> 645 </span>    89/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to *(EDI+4)</span>
-<span id="L646" class="LineNr"> 646 </span>    <span class="subxS1Comment"># . line-&gt;read = line-&gt;write</span>
-<span id="L647" class="LineNr"> 647 </span>    89/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to *(ESI+4)</span>
-<span id="L648" class="LineNr"> 648 </span>    <span class="subxS1Comment"># . return</span>
-<span id="L649" class="LineNr"> 649 </span>    eb/jump  $next-word:end/disp8
-<span id="L650" class="LineNr"> 650 </span><span class="Constant">$next-word:not-comment</span>:
-<span id="L651" class="LineNr"> 651 </span>    <span class="subxComment"># otherwise skip-chars-not-matching(line, ' ')</span>
+<span id="L549" class="LineNr"> 549 </span>    68/push  <span class="Constant">&quot;F - test-convert-passes-with-just-whitespace-through&quot;</span>/imm32
+<span id="L550" class="LineNr"> 550 </span>    68/push  <span class="Constant">&quot;    &quot;</span>/imm32
+<span id="L551" class="LineNr"> 551 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L552" class="LineNr"> 552 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L553" class="LineNr"> 553 </span>    e8/call  <a href='../058stream-equal.subx.html#L644'>check-next-stream-line-equal</a>/disp32
+<span id="L554" class="LineNr"> 554 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L555" class="LineNr"> 555 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L556" class="LineNr"> 556 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L557" class="LineNr"> 557 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L558" class="LineNr"> 558 </span>    5d/pop-to-EBP
+<span id="L559" class="LineNr"> 559 </span>    c3/return
+<span id="L560" class="LineNr"> 560 </span>
+<span id="L561" class="LineNr"> 561 </span><span class="subxTest">test-convert-passes-segment-headers-through</span>:
+<span id="L562" class="LineNr"> 562 </span>    <span class="subxComment"># if a line starts with '==', pass it along unchanged</span>
+<span id="L563" class="LineNr"> 563 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L564" class="LineNr"> 564 </span>    55/push-EBP
+<span id="L565" class="LineNr"> 565 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L566" class="LineNr"> 566 </span>    <span class="subxComment"># setup</span>
+<span id="L567" class="LineNr"> 567 </span>    <span class="subxS1Comment"># . clear-stream(_test-input-stream)</span>
+<span id="L568" class="LineNr"> 568 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L569" class="LineNr"> 569 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L570" class="LineNr"> 570 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L571" class="LineNr"> 571 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L572" class="LineNr"> 572 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L573" class="LineNr"> 573 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L574" class="LineNr"> 574 </span>    <span class="subxS1Comment"># . clear-stream(_test-input-buffered-file+4)</span>
+<span id="L575" class="LineNr"> 575 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L576" class="LineNr"> 576 </span>    b8/copy-to-EAX  <a href='pack.subx.html#L3323'>_test-input-buffered-file</a>/imm32
+<span id="L577" class="LineNr"> 577 </span>    05/add-to-EAX  4/imm32
+<span id="L578" class="LineNr"> 578 </span>    50/push-EAX
+<span id="L579" class="LineNr"> 579 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L580" class="LineNr"> 580 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L581" class="LineNr"> 581 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L582" class="LineNr"> 582 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L583" class="LineNr"> 583 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-stream)</span>
+<span id="L584" class="LineNr"> 584 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L585" class="LineNr"> 585 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L586" class="LineNr"> 586 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L587" class="LineNr"> 587 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L588" class="LineNr"> 588 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L589" class="LineNr"> 589 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L590" class="LineNr"> 590 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-buffered-file+4)</span>
+<span id="L591" class="LineNr"> 591 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L592" class="LineNr"> 592 </span>    b8/copy-to-EAX  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L593" class="LineNr"> 593 </span>    05/add-to-EAX  4/imm32
+<span id="L594" class="LineNr"> 594 </span>    50/push-EAX
+<span id="L595" class="LineNr"> 595 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L596" class="LineNr"> 596 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L597" class="LineNr"> 597 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L598" class="LineNr"> 598 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L599" class="LineNr"> 599 </span>    <span class="subxComment"># initialize input</span>
+<span id="L600" class="LineNr"> 600 </span>    <span class="subxS1Comment"># . write(_test-input-stream, &quot;== abcd&quot;)</span>
+<span id="L601" class="LineNr"> 601 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L602" class="LineNr"> 602 </span>    68/push  <span class="Constant">&quot;== abcd&quot;</span>/imm32
+<span id="L603" class="LineNr"> 603 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L604" class="LineNr"> 604 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L605" class="LineNr"> 605 </span>    e8/call  <a href='../057write.subx.html#L24'>write</a>/disp32
+<span id="L606" class="LineNr"> 606 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L607" class="LineNr"> 607 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L608" class="LineNr"> 608 </span>    <span class="subxComment"># convert(_test-input-buffered-file, _test-output-buffered-file)</span>
+<span id="L609" class="LineNr"> 609 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L610" class="LineNr"> 610 </span>    68/push  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L611" class="LineNr"> 611 </span>    68/push  <a href='pack.subx.html#L3323'>_test-input-buffered-file</a>/imm32
+<span id="L612" class="LineNr"> 612 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L613" class="LineNr"> 613 </span>    e8/call  <a href='pack.subx.html#L95'>convert</a>/disp32
+<span id="L614" class="LineNr"> 614 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L615" class="LineNr"> 615 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L616" class="LineNr"> 616 </span>    <span class="subxComment"># check that the line just passed through</span>
+<span id="L617" class="LineNr"> 617 </span>    <span class="subxS1Comment"># . flush(_test-output-buffered-file)</span>
+<span id="L618" class="LineNr"> 618 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L619" class="LineNr"> 619 </span>    68/push  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L620" class="LineNr"> 620 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L621" class="LineNr"> 621 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
+<span id="L622" class="LineNr"> 622 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L623" class="LineNr"> 623 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L624" class="LineNr"> 624 </span>    <span class="subxS1Comment"># . check-stream-equal(_test-output-stream, &quot;== abcd&quot;, msg)</span>
+<span id="L625" class="LineNr"> 625 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L626" class="LineNr"> 626 </span>    68/push  <span class="Constant">&quot;F - test-convert-passes-segment-headers-through&quot;</span>/imm32
+<span id="L627" class="LineNr"> 627 </span>    68/push  <span class="Constant">&quot;== abcd&quot;</span>/imm32
+<span id="L628" class="LineNr"> 628 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L629" class="LineNr"> 629 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L630" class="LineNr"> 630 </span>    e8/call  <a href='../058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
+<span id="L631" class="LineNr"> 631 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L632" class="LineNr"> 632 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L633" class="LineNr"> 633 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L634" class="LineNr"> 634 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L635" class="LineNr"> 635 </span>    5d/pop-to-EBP
+<span id="L636" class="LineNr"> 636 </span>    c3/return
+<span id="L637" class="LineNr"> 637 </span>
+<span id="L638" class="LineNr"> 638 </span><span class="subxTest">test-convert-in-data-segment</span>:
+<span id="L639" class="LineNr"> 639 </span>    <span class="subxComment"># correctly process lines in the data segment</span>
+<span id="L640" class="LineNr"> 640 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L641" class="LineNr"> 641 </span>    55/push-EBP
+<span id="L642" class="LineNr"> 642 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L643" class="LineNr"> 643 </span>    <span class="subxComment"># setup</span>
+<span id="L644" class="LineNr"> 644 </span>    <span class="subxS1Comment"># . clear-stream(_test-input-stream)</span>
+<span id="L645" class="LineNr"> 645 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L646" class="LineNr"> 646 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L647" class="LineNr"> 647 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L648" class="LineNr"> 648 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L649" class="LineNr"> 649 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L650" class="LineNr"> 650 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L651" class="LineNr"> 651 </span>    <span class="subxS1Comment"># . clear-stream(_test-input-buffered-file+4)</span>
 <span id="L652" class="LineNr"> 652 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L653" class="LineNr"> 653 </span>    68/push  0x20/imm32/space
-<span id="L654" class="LineNr"> 654 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
-<span id="L655" class="LineNr"> 655 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L656" class="LineNr"> 656 </span>    e8/call  <a href='../073next-token.subx.html#L468'>skip-chars-not-matching</a>/disp32
-<span id="L657" class="LineNr"> 657 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L658" class="LineNr"> 658 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L659" class="LineNr"> 659 </span>    <span class="subxComment"># out-&gt;end = &amp;line-&gt;data[line-&gt;read]</span>
-<span id="L660" class="LineNr"> 660 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESI+4) to ECX</span>
-<span id="L661" class="LineNr"> 661 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  1/index/ECX  <span class="Normal"> . </span>          0/r32/EAX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy ESI+ECX+12 to EAX</span>
-<span id="L662" class="LineNr"> 662 </span>    89/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to *(EDI+4)</span>
-<span id="L663" class="LineNr"> 663 </span><span class="Constant">$next-word:end</span>:
-<span id="L664" class="LineNr"> 664 </span>    <span class="subxS1Comment"># . restore registers</span>
-<span id="L665" class="LineNr"> 665 </span>    5f/pop-to-EDI
-<span id="L666" class="LineNr"> 666 </span>    5e/pop-to-ESI
-<span id="L667" class="LineNr"> 667 </span>    59/pop-to-ECX
-<span id="L668" class="LineNr"> 668 </span>    58/pop-to-EAX
-<span id="L669" class="LineNr"> 669 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L670" class="LineNr"> 670 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L671" class="LineNr"> 671 </span>    5d/pop-to-EBP
-<span id="L672" class="LineNr"> 672 </span>    c3/return
-<span id="L673" class="LineNr"> 673 </span>
-<span id="L674" class="LineNr"> 674 </span><span class="subxTest">test-next-word</span>:
-<span id="L675" class="LineNr"> 675 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L676" class="LineNr"> 676 </span>    55/push-EBP
-<span id="L677" class="LineNr"> 677 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L678" class="LineNr"> 678 </span>    <span class="subxComment"># setup</span>
-<span id="L679" class="LineNr"> 679 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
-<span id="L680" class="LineNr"> 680 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L681" class="LineNr"> 681 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L682" class="LineNr"> 682 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L683" class="LineNr"> 683 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L684" class="LineNr"> 684 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L685" class="LineNr"> 685 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L686" class="LineNr"> 686 </span>    <span class="subxComment"># var slice/ECX = {0, 0}</span>
-<span id="L687" class="LineNr"> 687 </span>    68/push  0/imm32/end
-<span id="L688" class="LineNr"> 688 </span>    68/push  0/imm32/start
-<span id="L689" class="LineNr"> 689 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
-<span id="L690" class="LineNr"> 690 </span>    <span class="subxComment"># write(_test-stream, &quot;  ab&quot;)</span>
-<span id="L691" class="LineNr"> 691 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L692" class="LineNr"> 692 </span>    68/push  <span class="Constant">&quot;  ab&quot;</span>/imm32
-<span id="L693" class="LineNr"> 693 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L694" class="LineNr"> 694 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L695" class="LineNr"> 695 </span>    e8/call  <a href='../057write.subx.html#L24'>write</a>/disp32
-<span id="L696" class="LineNr"> 696 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L697" class="LineNr"> 697 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L698" class="LineNr"> 698 </span>    <span class="subxComment"># next-word(_test-stream, slice)</span>
-<span id="L699" class="LineNr"> 699 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L700" class="LineNr"> 700 </span>    51/push-ECX
-<span id="L701" class="LineNr"> 701 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L702" class="LineNr"> 702 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L703" class="LineNr"> 703 </span>    e8/call  <a href='pack.subx.html#L610'>next-word</a>/disp32
-<span id="L704" class="LineNr"> 704 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L705" class="LineNr"> 705 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L706" class="LineNr"> 706 </span>    <span class="subxComment"># check-ints-equal(slice-&gt;start - _test-stream-&gt;data, 2, msg)</span>
-<span id="L707" class="LineNr"> 707 </span>    <span class="subxS1Comment"># . check-ints-equal(slice-&gt;start - _test-stream, 14, msg)</span>
-<span id="L708" class="LineNr"> 708 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L709" class="LineNr"> 709 </span>    68/push  <span class="Constant">&quot;F - <a href='pack.subx.html#L674'>test-next-word</a>: start&quot;</span>/imm32
-<span id="L710" class="LineNr"> 710 </span>    68/push  0xe/imm32
-<span id="L711" class="LineNr"> 711 </span>    <span class="subxS2Comment"># . . push slice-&gt;start - _test-stream</span>
-<span id="L712" class="LineNr"> 712 </span>    8b/copy                         0/mod/indirect  1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ECX to EAX</span>
-<span id="L713" class="LineNr"> 713 </span>    81          5/subop/subtract    3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              <a href='../057write.subx.html#L148'>_test-stream</a>/imm32 <span class="subxComment"># subtract from EAX</span>
-<span id="L714" class="LineNr"> 714 </span>    50/push-EAX
-<span id="L715" class="LineNr"> 715 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L716" class="LineNr"> 716 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L717" class="LineNr"> 717 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L718" class="LineNr"> 718 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L719" class="LineNr"> 719 </span>    <span class="subxComment"># check-ints-equal(slice-&gt;end - _test-stream-&gt;data, 4, msg)</span>
-<span id="L720" class="LineNr"> 720 </span>    <span class="subxS1Comment"># . check-ints-equal(slice-&gt;end - _test-stream, 16, msg)</span>
-<span id="L721" class="LineNr"> 721 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L722" class="LineNr"> 722 </span>    68/push  <span class="Constant">&quot;F - <a href='pack.subx.html#L674'>test-next-word</a>: end&quot;</span>/imm32
-<span id="L723" class="LineNr"> 723 </span>    68/push  0x10/imm32
-<span id="L724" class="LineNr"> 724 </span>    <span class="subxS2Comment"># . . push slice-&gt;end - _test-stream</span>
-<span id="L725" class="LineNr"> 725 </span>    8b/copy                         1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ECX+4) to EAX</span>
-<span id="L726" class="LineNr"> 726 </span>    81          5/subop/subtract    3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              <a href='../057write.subx.html#L148'>_test-stream</a>/imm32 <span class="subxComment"># subtract from EAX</span>
-<span id="L727" class="LineNr"> 727 </span>    50/push-EAX
-<span id="L728" class="LineNr"> 728 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L729" class="LineNr"> 729 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L730" class="LineNr"> 730 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L731" class="LineNr"> 731 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L732" class="LineNr"> 732 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L733" class="LineNr"> 733 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L734" class="LineNr"> 734 </span>    5d/pop-to-EBP
-<span id="L735" class="LineNr"> 735 </span>    c3/return
-<span id="L736" class="LineNr"> 736 </span>
-<span id="L737" class="LineNr"> 737 </span><span class="subxTest">test-next-word-returns-whole-comment</span>:
-<span id="L738" class="LineNr"> 738 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L739" class="LineNr"> 739 </span>    55/push-EBP
-<span id="L740" class="LineNr"> 740 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L741" class="LineNr"> 741 </span>    <span class="subxComment"># setup</span>
-<span id="L742" class="LineNr"> 742 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
-<span id="L743" class="LineNr"> 743 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L744" class="LineNr"> 744 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L745" class="LineNr"> 745 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L746" class="LineNr"> 746 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L747" class="LineNr"> 747 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L748" class="LineNr"> 748 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L749" class="LineNr"> 749 </span>    <span class="subxComment"># var slice/ECX = {0, 0}</span>
-<span id="L750" class="LineNr"> 750 </span>    68/push  0/imm32/end
-<span id="L751" class="LineNr"> 751 </span>    68/push  0/imm32/start
-<span id="L752" class="LineNr"> 752 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
-<span id="L753" class="LineNr"> 753 </span>    <span class="subxComment"># write(_test-stream, &quot;  # a&quot;)</span>
-<span id="L754" class="LineNr"> 754 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L755" class="LineNr"> 755 </span>    68/push  <span class="Constant">&quot;  # a&quot;</span>/imm32
-<span id="L756" class="LineNr"> 756 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L757" class="LineNr"> 757 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L758" class="LineNr"> 758 </span>    e8/call  <a href='../057write.subx.html#L24'>write</a>/disp32
-<span id="L759" class="LineNr"> 759 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L760" class="LineNr"> 760 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L761" class="LineNr"> 761 </span>    <span class="subxComment"># next-word(_test-stream, slice)</span>
-<span id="L762" class="LineNr"> 762 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L763" class="LineNr"> 763 </span>    51/push-ECX
-<span id="L764" class="LineNr"> 764 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L765" class="LineNr"> 765 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L766" class="LineNr"> 766 </span>    e8/call  <a href='pack.subx.html#L610'>next-word</a>/disp32
-<span id="L767" class="LineNr"> 767 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L768" class="LineNr"> 768 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L769" class="LineNr"> 769 </span>    <span class="subxComment"># check-ints-equal(slice-&gt;start - _test-stream-&gt;data, 2, msg)</span>
-<span id="L770" class="LineNr"> 770 </span>    <span class="subxS1Comment"># . check-ints-equal(slice-&gt;start - _test-stream, 14, msg)</span>
-<span id="L771" class="LineNr"> 771 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L772" class="LineNr"> 772 </span>    68/push  <span class="Constant">&quot;F - <a href='pack.subx.html#L737'>test-next-word-returns-whole-comment</a>: start&quot;</span>/imm32
-<span id="L773" class="LineNr"> 773 </span>    68/push  0xe/imm32
-<span id="L774" class="LineNr"> 774 </span>    <span class="subxS2Comment"># . . push slice-&gt;start - _test-stream</span>
-<span id="L775" class="LineNr"> 775 </span>    8b/copy                         0/mod/indirect  1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ECX to EAX</span>
-<span id="L776" class="LineNr"> 776 </span>    81          5/subop/subtract    3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              <a href='../057write.subx.html#L148'>_test-stream</a>/imm32 <span class="subxComment"># subtract from EAX</span>
-<span id="L777" class="LineNr"> 777 </span>    50/push-EAX
-<span id="L778" class="LineNr"> 778 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L779" class="LineNr"> 779 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L780" class="LineNr"> 780 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L781" class="LineNr"> 781 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L782" class="LineNr"> 782 </span>    <span class="subxComment"># check-ints-equal(slice-&gt;end - _test-stream-&gt;data, 5, msg)</span>
-<span id="L783" class="LineNr"> 783 </span>    <span class="subxS1Comment"># . check-ints-equal(slice-&gt;end - _test-stream, 17, msg)</span>
-<span id="L784" class="LineNr"> 784 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L785" class="LineNr"> 785 </span>    68/push  <span class="Constant">&quot;F - <a href='pack.subx.html#L737'>test-next-word-returns-whole-comment</a>: end&quot;</span>/imm32
-<span id="L786" class="LineNr"> 786 </span>    68/push  0x11/imm32
-<span id="L787" class="LineNr"> 787 </span>    <span class="subxS2Comment"># . . push slice-&gt;end - _test-stream</span>
-<span id="L788" class="LineNr"> 788 </span>    8b/copy                         1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ECX+4) to EAX</span>
-<span id="L789" class="LineNr"> 789 </span>    81          5/subop/subtract    3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              <a href='../057write.subx.html#L148'>_test-stream</a>/imm32 <span class="subxComment"># subtract from EAX</span>
-<span id="L790" class="LineNr"> 790 </span>    50/push-EAX
-<span id="L791" class="LineNr"> 791 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L792" class="LineNr"> 792 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L793" class="LineNr"> 793 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L794" class="LineNr"> 794 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L795" class="LineNr"> 795 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L796" class="LineNr"> 796 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L797" class="LineNr"> 797 </span>    5d/pop-to-EBP
-<span id="L798" class="LineNr"> 798 </span>    c3/return
-<span id="L799" class="LineNr"> 799 </span>
-<span id="L800" class="LineNr"> 800 </span><span class="subxFunction">has-metadata?</span>:  <span class="subxComment"># word : (address slice), s : (address string) -&gt; EAX : boolean</span>
-<span id="L801" class="LineNr"> 801 </span>    <span class="subxComment"># pseudocode:</span>
-<span id="L802" class="LineNr"> 802 </span>    <span class="subxComment">#   var twig : &amp;slice = next-token-from-slice(word-&gt;start, word-&gt;end, '/')  # skip name</span>
-<span id="L803" class="LineNr"> 803 </span>    <span class="subxComment">#   curr = twig-&gt;end</span>
-<span id="L804" class="LineNr"> 804 </span>    <span class="subxComment">#   while true:</span>
-<span id="L805" class="LineNr"> 805 </span>    <span class="subxComment">#     twig = next-token-from-slice(curr, word-&gt;end, '/')</span>
-<span id="L806" class="LineNr"> 806 </span>    <span class="subxComment">#     if (twig.empty()) break</span>
-<span id="L807" class="LineNr"> 807 </span>    <span class="subxComment">#     if (slice-equal?(twig, s)) return true</span>
-<span id="L808" class="LineNr"> 808 </span>    <span class="subxComment">#     curr = twig-&gt;end</span>
-<span id="L809" class="LineNr"> 809 </span>    <span class="subxComment">#   return false</span>
-<span id="L810" class="LineNr"> 810 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L811" class="LineNr"> 811 </span>    55/push-EBP
-<span id="L812" class="LineNr"> 812 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L813" class="LineNr"> 813 </span>    <span class="subxS1Comment"># . save registers</span>
-<span id="L814" class="LineNr"> 814 </span>    51/push-ECX
-<span id="L815" class="LineNr"> 815 </span>    52/push-EDX
-<span id="L816" class="LineNr"> 816 </span>    56/push-ESI
-<span id="L817" class="LineNr"> 817 </span>    57/push-EDI
-<span id="L818" class="LineNr"> 818 </span>    <span class="subxComment"># ESI = word</span>
-<span id="L819" class="LineNr"> 819 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
-<span id="L820" class="LineNr"> 820 </span>    <span class="subxComment"># EDX = word-&gt;end</span>
-<span id="L821" class="LineNr"> 821 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESI+4) to EDX</span>
-<span id="L822" class="LineNr"> 822 </span>    <span class="subxComment"># var twig/EDI : (address slice) = {0, 0}</span>
-<span id="L823" class="LineNr"> 823 </span>    68/push  0/imm32/end
-<span id="L824" class="LineNr"> 824 </span>    68/push  0/imm32/start
-<span id="L825" class="LineNr"> 825 </span>    89/copy                         3/mod/direct    7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EDI</span>
-<span id="L826" class="LineNr"> 826 </span>    <span class="subxComment"># next-token-from-slice(word-&gt;start, word-&gt;end, '/', twig)</span>
-<span id="L827" class="LineNr"> 827 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L828" class="LineNr"> 828 </span>    57/push-EDI
-<span id="L829" class="LineNr"> 829 </span>    68/push  0x2f/imm32/slash
-<span id="L830" class="LineNr"> 830 </span>    52/push-EDX
-<span id="L831" class="LineNr"> 831 </span>    ff          6/subop/push        0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># push *ESI</span>
-<span id="L832" class="LineNr"> 832 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L833" class="LineNr"> 833 </span>    e8/call  <a href='../073next-token.subx.html#L168'>next-token-from-slice</a>/disp32
-<span id="L834" class="LineNr"> 834 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L835" class="LineNr"> 835 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
-<span id="L836" class="LineNr"> 836 </span>    <span class="subxComment"># curr/ECX = twig-&gt;end</span>
-<span id="L837" class="LineNr"> 837 </span>    8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EDI+4) to ECX</span>
-<span id="L838" class="LineNr"> 838 </span><span class="Constant">$has-metadata?:loop</span>:
-<span id="L839" class="LineNr"> 839 </span>    <span class="subxComment"># next-token-from-slice(curr, word-&gt;end, '/', twig)</span>
-<span id="L840" class="LineNr"> 840 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L841" class="LineNr"> 841 </span>    57/push-EDI
-<span id="L842" class="LineNr"> 842 </span>    68/push  0x2f/imm32/slash
-<span id="L843" class="LineNr"> 843 </span>    52/push-EDX
-<span id="L844" class="LineNr"> 844 </span>    51/push-ECX
-<span id="L845" class="LineNr"> 845 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L846" class="LineNr"> 846 </span>    e8/call  <a href='../073next-token.subx.html#L168'>next-token-from-slice</a>/disp32
-<span id="L847" class="LineNr"> 847 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L848" class="LineNr"> 848 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
-<span id="L849" class="LineNr"> 849 </span>    <span class="subxComment"># if (slice-empty?(twig)) return false</span>
-<span id="L850" class="LineNr"> 850 </span>    <span class="subxS1Comment"># . EAX = slice-empty?(twig)</span>
-<span id="L851" class="LineNr"> 851 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L852" class="LineNr"> 852 </span>    57/push-EDI
-<span id="L853" class="LineNr"> 853 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L854" class="LineNr"> 854 </span>    e8/call  <a href='../072slice.subx.html#L17'>slice-empty?</a>/disp32
-<span id="L855" class="LineNr"> 855 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L856" class="LineNr"> 856 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L857" class="LineNr"> 857 </span>    <span class="subxS1Comment"># . if (EAX != 0) return false</span>
-<span id="L858" class="LineNr"> 858 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># compare EAX</span>
-<span id="L859" class="LineNr"> 859 </span>    75/compare-if-not-equal  $has-metadata?:false/disp8
-<span id="L860" class="LineNr"> 860 </span>    <span class="subxComment"># if (slice-equal?(twig, s)) return true</span>
-<span id="L861" class="LineNr"> 861 </span>    <span class="subxS1Comment"># . EAX = slice-equal?(twig, s)</span>
-<span id="L862" class="LineNr"> 862 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L863" class="LineNr"> 863 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
-<span id="L864" class="LineNr"> 864 </span>    57/push-EDI
-<span id="L865" class="LineNr"> 865 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L866" class="LineNr"> 866 </span>    e8/call  <a href='../072slice.subx.html#L99'>slice-equal?</a>/disp32
-<span id="L867" class="LineNr"> 867 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L868" class="LineNr"> 868 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L869" class="LineNr"> 869 </span>    <span class="subxS1Comment"># . if (EAX != 0) return true</span>
-<span id="L870" class="LineNr"> 870 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># compare EAX</span>
-<span id="L871" class="LineNr"> 871 </span>    75/compare-if-not-equal  $has-metadata?:true/disp8
-<span id="L872" class="LineNr"> 872 </span>    <span class="subxComment"># curr = twig-&gt;end</span>
-<span id="L873" class="LineNr"> 873 </span>    8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EDI+4) to ECX</span>
-<span id="L874" class="LineNr"> 874 </span>    eb/jump  $has-metadata?:loop/disp8
-<span id="L875" class="LineNr"> 875 </span><span class="Constant">$has-metadata?:true</span>:
-<span id="L876" class="LineNr"> 876 </span>    b8/copy-to-EAX  1/imm32/true
-<span id="L877" class="LineNr"> 877 </span>    eb/jump  $has-metadata?:end/disp8
-<span id="L878" class="LineNr"> 878 </span><span class="Constant">$has-metadata?:false</span>:
-<span id="L879" class="LineNr"> 879 </span>    b8/copy-to-EAX  0/imm32/false
-<span id="L880" class="LineNr"> 880 </span><span class="Constant">$has-metadata?:end</span>:
-<span id="L881" class="LineNr"> 881 </span>    <span class="subxS1Comment"># . reclaim locals</span>
-<span id="L882" class="LineNr"> 882 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L883" class="LineNr"> 883 </span>    <span class="subxS1Comment"># . restore registers</span>
-<span id="L884" class="LineNr"> 884 </span>    5f/pop-to-EDI
-<span id="L885" class="LineNr"> 885 </span>    5e/pop-to-ESI
-<span id="L886" class="LineNr"> 886 </span>    5a/pop-to-EDX
-<span id="L887" class="LineNr"> 887 </span>    59/pop-to-ECX
-<span id="L888" class="LineNr"> 888 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L889" class="LineNr"> 889 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L890" class="LineNr"> 890 </span>    5d/pop-to-EBP
-<span id="L891" class="LineNr"> 891 </span>    c3/return
-<span id="L892" class="LineNr"> 892 </span>
-<span id="L893" class="LineNr"> 893 </span><span class="subxTest">test-has-metadata-true</span>:
-<span id="L894" class="LineNr"> 894 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L895" class="LineNr"> 895 </span>    55/push-EBP
-<span id="L896" class="LineNr"> 896 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L897" class="LineNr"> 897 </span>    <span class="subxComment"># (EAX..ECX) = &quot;ab/c&quot;</span>
-<span id="L898" class="LineNr"> 898 </span>    b8/copy-to-EAX  <span class="Constant">&quot;ab/c&quot;</span>/imm32
-<span id="L899" class="LineNr"> 899 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EAX to ECX</span>
-<span id="L900" class="LineNr"> 900 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX+ECX+4 to ECX</span>
-<span id="L901" class="LineNr"> 901 </span>    05/add-to-EAX  4/imm32
-<span id="L902" class="LineNr"> 902 </span>    <span class="subxComment"># var in/ESI : (address slice) = {EAX, ECX}</span>
-<span id="L903" class="LineNr"> 903 </span>    51/push-ECX
-<span id="L904" class="LineNr"> 904 </span>    50/push-EAX
-<span id="L905" class="LineNr"> 905 </span>    89/copy                         3/mod/direct    6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ESI</span>
-<span id="L906" class="LineNr"> 906 </span>    <span class="subxComment"># EAX = has-metadata?(ESI, &quot;c&quot;)</span>
-<span id="L907" class="LineNr"> 907 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L908" class="LineNr"> 908 </span>    68/push  <span class="Constant">&quot;c&quot;</span>/imm32
-<span id="L909" class="LineNr"> 909 </span>    56/push-ESI
-<span id="L910" class="LineNr"> 910 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L911" class="LineNr"> 911 </span>    e8/call  <a href='pack.subx.html#L800'>has-metadata?</a>/disp32
-<span id="L912" class="LineNr"> 912 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L913" class="LineNr"> 913 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x8/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L914" class="LineNr"> 914 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
-<span id="L915" class="LineNr"> 915 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L916" class="LineNr"> 916 </span>    68/push  <span class="Constant">&quot;F - test-has-metadata-true&quot;</span>/imm32
-<span id="L917" class="LineNr"> 917 </span>    68/push  1/imm32/true
-<span id="L918" class="LineNr"> 918 </span>    50/push-EAX
-<span id="L919" class="LineNr"> 919 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L920" class="LineNr"> 920 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L921" class="LineNr"> 921 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L922" class="LineNr"> 922 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L923" class="LineNr"> 923 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L924" class="LineNr"> 924 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L925" class="LineNr"> 925 </span>    5d/pop-to-EBP
-<span id="L926" class="LineNr"> 926 </span>    c3/return
-<span id="L927" class="LineNr"> 927 </span>
-<span id="L928" class="LineNr"> 928 </span><span class="subxTest">test-has-metadata-false</span>:
-<span id="L929" class="LineNr"> 929 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L930" class="LineNr"> 930 </span>    55/push-EBP
-<span id="L931" class="LineNr"> 931 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L932" class="LineNr"> 932 </span>    <span class="subxComment"># (EAX..ECX) = &quot;ab/c&quot;</span>
-<span id="L933" class="LineNr"> 933 </span>    b8/copy-to-EAX  <span class="Constant">&quot;ab/c&quot;</span>/imm32
-<span id="L934" class="LineNr"> 934 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EAX to ECX</span>
-<span id="L935" class="LineNr"> 935 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX+ECX+4 to ECX</span>
-<span id="L936" class="LineNr"> 936 </span>    05/add-to-EAX  4/imm32
-<span id="L937" class="LineNr"> 937 </span>    <span class="subxComment"># var in/ESI : (address slice) = {EAX, ECX}</span>
-<span id="L938" class="LineNr"> 938 </span>    51/push-ECX
-<span id="L939" class="LineNr"> 939 </span>    50/push-EAX
-<span id="L940" class="LineNr"> 940 </span>    89/copy                         3/mod/direct    6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ESI</span>
-<span id="L941" class="LineNr"> 941 </span>    <span class="subxComment"># EAX = has-metadata?(ESI, &quot;c&quot;)</span>
-<span id="L942" class="LineNr"> 942 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L943" class="LineNr"> 943 </span>    68/push  <span class="Constant">&quot;d&quot;</span>/imm32
-<span id="L944" class="LineNr"> 944 </span>    56/push-ESI
-<span id="L945" class="LineNr"> 945 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L946" class="LineNr"> 946 </span>    e8/call  <a href='pack.subx.html#L800'>has-metadata?</a>/disp32
-<span id="L947" class="LineNr"> 947 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L948" class="LineNr"> 948 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x8/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L949" class="LineNr"> 949 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
-<span id="L950" class="LineNr"> 950 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L951" class="LineNr"> 951 </span>    68/push  <span class="Constant">&quot;F - test-has-metadata-false&quot;</span>/imm32
-<span id="L952" class="LineNr"> 952 </span>    68/push  0/imm32/false
-<span id="L953" class="LineNr"> 953 </span>    50/push-EAX
-<span id="L954" class="LineNr"> 954 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L955" class="LineNr"> 955 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L956" class="LineNr"> 956 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L957" class="LineNr"> 957 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L958" class="LineNr"> 958 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L959" class="LineNr"> 959 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L960" class="LineNr"> 960 </span>    5d/pop-to-EBP
-<span id="L961" class="LineNr"> 961 </span>    c3/return
-<span id="L962" class="LineNr"> 962 </span>
-<span id="L963" class="LineNr"> 963 </span><span class="subxTest">test-has-metadata-ignore-name</span>:
-<span id="L964" class="LineNr"> 964 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L965" class="LineNr"> 965 </span>    55/push-EBP
-<span id="L966" class="LineNr"> 966 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L967" class="LineNr"> 967 </span>    <span class="subxComment"># (EAX..ECX) = &quot;a/b&quot;</span>
-<span id="L968" class="LineNr"> 968 </span>    b8/copy-to-EAX  <span class="Constant">&quot;a/b&quot;</span>/imm32
-<span id="L969" class="LineNr"> 969 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EAX to ECX</span>
-<span id="L970" class="LineNr"> 970 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX+ECX+4 to ECX</span>
-<span id="L971" class="LineNr"> 971 </span>    05/add-to-EAX  4/imm32
-<span id="L972" class="LineNr"> 972 </span>    <span class="subxComment"># var in/ESI : (address slice) = {EAX, ECX}</span>
-<span id="L973" class="LineNr"> 973 </span>    51/push-ECX
-<span id="L974" class="LineNr"> 974 </span>    50/push-EAX
-<span id="L975" class="LineNr"> 975 </span>    89/copy                         3/mod/direct    6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ESI</span>
-<span id="L976" class="LineNr"> 976 </span>    <span class="subxComment"># EAX = has-metadata?(ESI, &quot;a&quot;)</span>
-<span id="L977" class="LineNr"> 977 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L978" class="LineNr"> 978 </span>    68/push  <span class="Constant">&quot;a&quot;</span>/imm32
-<span id="L979" class="LineNr"> 979 </span>    56/push-ESI
-<span id="L980" class="LineNr"> 980 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L981" class="LineNr"> 981 </span>    e8/call  <a href='pack.subx.html#L800'>has-metadata?</a>/disp32
-<span id="L982" class="LineNr"> 982 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L983" class="LineNr"> 983 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x8/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L984" class="LineNr"> 984 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
-<span id="L985" class="LineNr"> 985 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L986" class="LineNr"> 986 </span>    68/push  <span class="Constant">&quot;F - test-has-metadata-ignore-name&quot;</span>/imm32
-<span id="L987" class="LineNr"> 987 </span>    68/push  0/imm32/false
-<span id="L988" class="LineNr"> 988 </span>    50/push-EAX
-<span id="L989" class="LineNr"> 989 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L990" class="LineNr"> 990 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L991" class="LineNr"> 991 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L992" class="LineNr"> 992 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L993" class="LineNr"> 993 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L994" class="LineNr"> 994 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L995" class="LineNr"> 995 </span>    5d/pop-to-EBP
-<span id="L996" class="LineNr"> 996 </span>    c3/return
-<span id="L997" class="LineNr"> 997 </span>
-<span id="L998" class="LineNr"> 998 </span><span class="subxTest">test-has-metadata-multiple-true</span>:
-<span id="L999" class="LineNr"> 999 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L1000" class="LineNr">1000 </span>    55/push-EBP
-<span id="L1001" class="LineNr">1001 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L1002" class="LineNr">1002 </span>    <span class="subxComment"># (EAX..ECX) = &quot;a/b/c&quot;</span>
-<span id="L1003" class="LineNr">1003 </span>    b8/copy-to-EAX  <span class="Constant">&quot;a/b/c&quot;</span>/imm32
-<span id="L1004" class="LineNr">1004 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EAX to ECX</span>
-<span id="L1005" class="LineNr">1005 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX+ECX+4 to ECX</span>
-<span id="L1006" class="LineNr">1006 </span>    05/add-to-EAX  4/imm32
-<span id="L1007" class="LineNr">1007 </span>    <span class="subxComment"># var in/ESI : (address slice) = {EAX, ECX}</span>
-<span id="L1008" class="LineNr">1008 </span>    51/push-ECX
-<span id="L1009" class="LineNr">1009 </span>    50/push-EAX
-<span id="L1010" class="LineNr">1010 </span>    89/copy                         3/mod/direct    6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ESI</span>
-<span id="L1011" class="LineNr">1011 </span>    <span class="subxComment"># EAX = has-metadata?(ESI, &quot;c&quot;)</span>
-<span id="L1012" class="LineNr">1012 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1013" class="LineNr">1013 </span>    68/push  <span class="Constant">&quot;c&quot;</span>/imm32
-<span id="L1014" class="LineNr">1014 </span>    56/push-ESI
-<span id="L1015" class="LineNr">1015 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1016" class="LineNr">1016 </span>    e8/call  <a href='pack.subx.html#L800'>has-metadata?</a>/disp32
-<span id="L1017" class="LineNr">1017 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1018" class="LineNr">1018 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x8/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L1019" class="LineNr">1019 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
-<span id="L1020" class="LineNr">1020 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1021" class="LineNr">1021 </span>    68/push  <span class="Constant">&quot;F - test-has-metadata-multiple-true&quot;</span>/imm32
-<span id="L1022" class="LineNr">1022 </span>    68/push  1/imm32/true
-<span id="L1023" class="LineNr">1023 </span>    50/push-EAX
-<span id="L1024" class="LineNr">1024 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1025" class="LineNr">1025 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L1026" class="LineNr">1026 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1027" class="LineNr">1027 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L1028" class="LineNr">1028 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L1029" class="LineNr">1029 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L1030" class="LineNr">1030 </span>    5d/pop-to-EBP
-<span id="L1031" class="LineNr">1031 </span>    c3/return
-<span id="L1032" class="LineNr">1032 </span>
-<span id="L1033" class="LineNr">1033 </span><span class="subxTest">test-has-metadata-multiple-false</span>:
-<span id="L1034" class="LineNr">1034 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L1035" class="LineNr">1035 </span>    55/push-EBP
-<span id="L1036" class="LineNr">1036 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L1037" class="LineNr">1037 </span>    <span class="subxComment"># (EAX..ECX) = &quot;a/b/c&quot;</span>
-<span id="L1038" class="LineNr">1038 </span>    b8/copy-to-EAX  <span class="Constant">&quot;a/b/c&quot;</span>/imm32
-<span id="L1039" class="LineNr">1039 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EAX to ECX</span>
-<span id="L1040" class="LineNr">1040 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX+ECX+4 to ECX</span>
-<span id="L1041" class="LineNr">1041 </span>    05/add-to-EAX  4/imm32
-<span id="L1042" class="LineNr">1042 </span>    <span class="subxComment"># var in/ESI : (address slice) = {EAX, ECX}</span>
-<span id="L1043" class="LineNr">1043 </span>    51/push-ECX
-<span id="L1044" class="LineNr">1044 </span>    50/push-EAX
-<span id="L1045" class="LineNr">1045 </span>    89/copy                         3/mod/direct    6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ESI</span>
-<span id="L1046" class="LineNr">1046 </span>    <span class="subxComment"># EAX = has-metadata?(ESI, &quot;d&quot;)</span>
-<span id="L1047" class="LineNr">1047 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1048" class="LineNr">1048 </span>    68/push  <span class="Constant">&quot;d&quot;</span>/imm32
-<span id="L1049" class="LineNr">1049 </span>    56/push-ESI
-<span id="L1050" class="LineNr">1050 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1051" class="LineNr">1051 </span>    e8/call  <a href='pack.subx.html#L800'>has-metadata?</a>/disp32
-<span id="L1052" class="LineNr">1052 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1053" class="LineNr">1053 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x8/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L1054" class="LineNr">1054 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
-<span id="L1055" class="LineNr">1055 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1056" class="LineNr">1056 </span>    68/push  <span class="Constant">&quot;F - test-has-metadata-multiple-false&quot;</span>/imm32
-<span id="L1057" class="LineNr">1057 </span>    68/push  0/imm32/false
-<span id="L1058" class="LineNr">1058 </span>    50/push-EAX
-<span id="L1059" class="LineNr">1059 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1060" class="LineNr">1060 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L1061" class="LineNr">1061 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1062" class="LineNr">1062 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L1063" class="LineNr">1063 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L1064" class="LineNr">1064 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L1065" class="LineNr">1065 </span>    5d/pop-to-EBP
-<span id="L1066" class="LineNr">1066 </span>    c3/return
-<span id="L1067" class="LineNr">1067 </span>
-<span id="L1068" class="LineNr">1068 </span><span class="subxComment"># if the name of 'word' is all hex digits, parse and print its value in 'width' bytes of hex, least significant first</span>
-<span id="L1069" class="LineNr">1069 </span><span class="subxComment"># otherwise just print the entire word</span>
-<span id="L1070" class="LineNr">1070 </span><span class="subxFunction">emit</span>:  <span class="subxComment"># out : (address buffered-file), word : (address slice), width : int</span>
-<span id="L1071" class="LineNr">1071 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L1072" class="LineNr">1072 </span>    55/push-EBP
-<span id="L1073" class="LineNr">1073 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L1074" class="LineNr">1074 </span>    <span class="subxS1Comment"># . save registers</span>
-<span id="L1075" class="LineNr">1075 </span>    50/push-EAX
-<span id="L1076" class="LineNr">1076 </span>    56/push-ESI
-<span id="L1077" class="LineNr">1077 </span>    57/push-EDI
-<span id="L1078" class="LineNr">1078 </span>    <span class="subxComment"># ESI = word</span>
-<span id="L1079" class="LineNr">1079 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to ESI</span>
-<span id="L1080" class="LineNr">1080 </span>    <span class="subxComment"># var name/EDI : (address slice) = {0, 0}</span>
-<span id="L1081" class="LineNr">1081 </span>    68/push  0/imm32/end
-<span id="L1082" class="LineNr">1082 </span>    68/push  0/imm32/start
-<span id="L1083" class="LineNr">1083 </span>    89/copy                         3/mod/direct    7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EDI</span>
-<span id="L1084" class="LineNr">1084 </span>    <span class="subxComment"># name = next-token-from-slice(word-&gt;start, word-&gt;end, '/')</span>
-<span id="L1085" class="LineNr">1085 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1086" class="LineNr">1086 </span>    57/push-EDI
-<span id="L1087" class="LineNr">1087 </span>    68/push  0x2f/imm32/slash
-<span id="L1088" class="LineNr">1088 </span>    ff          6/subop/push        1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(ESI+4)</span>
-<span id="L1089" class="LineNr">1089 </span>    ff          6/subop/push        0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># push *ESI</span>
-<span id="L1090" class="LineNr">1090 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1091" class="LineNr">1091 </span>    e8/call  <a href='../073next-token.subx.html#L168'>next-token-from-slice</a>/disp32
-<span id="L1092" class="LineNr">1092 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1093" class="LineNr">1093 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
-<span id="L1094" class="LineNr">1094 </span>    <span class="subxComment"># if (!is-hex-int?(name)) write-slice(out, word) and return</span>
-<span id="L1095" class="LineNr">1095 </span>    <span class="subxS1Comment"># . is-hex-int?(name)</span>
-<span id="L1096" class="LineNr">1096 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1097" class="LineNr">1097 </span>    57/push-EDI
-<span id="L1098" class="LineNr">1098 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1099" class="LineNr">1099 </span>    e8/call  <a href='../065hex.subx.html#L9'>is-hex-int?</a>/disp32
-<span id="L1100" class="LineNr">1100 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1101" class="LineNr">1101 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1102" class="LineNr">1102 </span>    <span class="subxS1Comment"># . if (EAX == 0)</span>
-<span id="L1103" class="LineNr">1103 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># compare EAX</span>
-<span id="L1104" class="LineNr">1104 </span>    75/jump-if-not-equal  $emit:hex-int/disp8
-<span id="L1105" class="LineNr">1105 </span>    <span class="subxS1Comment"># . write-slice(out, word)</span>
-<span id="L1106" class="LineNr">1106 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1107" class="LineNr">1107 </span>    56/push-ESI
-<span id="L1108" class="LineNr">1108 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
-<span id="L1109" class="LineNr">1109 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1110" class="LineNr">1110 </span>    e8/call  <a href='../072slice.subx.html#L667'>write-slice</a>/disp32
-<span id="L1111" class="LineNr">1111 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1112" class="LineNr">1112 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1113" class="LineNr">1113 </span>    <span class="subxS1Comment"># . return</span>
-<span id="L1114" class="LineNr">1114 </span>    eb/jump  $emit:end/disp8
-<span id="L1115" class="LineNr">1115 </span>    <span class="subxComment"># otherwise emit-hex(out, parse-hex-int(name), width)</span>
-<span id="L1116" class="LineNr">1116 </span><span class="Constant">$emit:hex-int</span>:
-<span id="L1117" class="LineNr">1117 </span>    <span class="subxS1Comment"># . n/EAX = parse-hex-int(name)</span>
-<span id="L1118" class="LineNr">1118 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1119" class="LineNr">1119 </span>    57/push-EDI
-<span id="L1120" class="LineNr">1120 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1121" class="LineNr">1121 </span>    e8/call  <a href='../065hex.subx.html#L319'>parse-hex-int</a>/disp32
-<span id="L1122" class="LineNr">1122 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1123" class="LineNr">1123 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1124" class="LineNr">1124 </span>    <span class="subxS1Comment"># . emit-hex(out, n, width)</span>
-<span id="L1125" class="LineNr">1125 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1126" class="LineNr">1126 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
-<span id="L1127" class="LineNr">1127 </span>    50/push-EAX
-<span id="L1128" class="LineNr">1128 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
-<span id="L1129" class="LineNr">1129 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1130" class="LineNr">1130 </span>    e8/call  <a href='pack.subx.html#L1401'>emit-hex</a>/disp32
-<span id="L1131" class="LineNr">1131 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1132" class="LineNr">1132 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L1133" class="LineNr">1133 </span><span class="Constant">$emit:end</span>:
-<span id="L1134" class="LineNr">1134 </span>    <span class="subxS1Comment"># . reclaim locals</span>
-<span id="L1135" class="LineNr">1135 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1136" class="LineNr">1136 </span>    <span class="subxS1Comment"># . restore registers</span>
-<span id="L1137" class="LineNr">1137 </span>    5f/pop-to-EDI
-<span id="L1138" class="LineNr">1138 </span>    5e/pop-to-ESI
-<span id="L1139" class="LineNr">1139 </span>    58/pop-to-EAX
-<span id="L1140" class="LineNr">1140 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L1141" class="LineNr">1141 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L1142" class="LineNr">1142 </span>    5d/pop-to-EBP
-<span id="L1143" class="LineNr">1143 </span>    c3/return
-<span id="L1144" class="LineNr">1144 </span>
-<span id="L1145" class="LineNr">1145 </span><span class="subxTest">test-emit-number</span>:
-<span id="L1146" class="LineNr">1146 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L1147" class="LineNr">1147 </span>    55/push-EBP
-<span id="L1148" class="LineNr">1148 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L1149" class="LineNr">1149 </span>    <span class="subxComment"># setup</span>
-<span id="L1150" class="LineNr">1150 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
-<span id="L1151" class="LineNr">1151 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1152" class="LineNr">1152 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L1153" class="LineNr">1153 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1154" class="LineNr">1154 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L1155" class="LineNr">1155 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1156" class="LineNr">1156 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1157" class="LineNr">1157 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
-<span id="L1158" class="LineNr">1158 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1159" class="LineNr">1159 </span>    b8/copy-to-EAX  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L1160" class="LineNr">1160 </span>    05/add-to-EAX  4/imm32
-<span id="L1161" class="LineNr">1161 </span>    50/push-EAX
-<span id="L1162" class="LineNr">1162 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1163" class="LineNr">1163 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L1164" class="LineNr">1164 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1165" class="LineNr">1165 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1166" class="LineNr">1166 </span>    <span class="subxComment"># var slice/ECX = &quot;-2&quot;</span>
-<span id="L1167" class="LineNr">1167 </span>    68/push  <a href='pack.subx.html#L1688'>_test-slice-negative-two-end</a>/imm32/end
-<span id="L1168" class="LineNr">1168 </span>    68/push  <a href='pack.subx.html#L1686'>_test-slice-negative-two</a>/imm32/start
-<span id="L1169" class="LineNr">1169 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
-<span id="L1170" class="LineNr">1170 </span>    <span class="subxComment"># emit(_test-buffered-file, slice, 2)</span>
-<span id="L1171" class="LineNr">1171 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1172" class="LineNr">1172 </span>    68/push  2/imm32
-<span id="L1173" class="LineNr">1173 </span>    51/push-ECX
-<span id="L1174" class="LineNr">1174 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L1175" class="LineNr">1175 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1176" class="LineNr">1176 </span>    e8/call  <a href='pack.subx.html#L1070'>emit</a>/disp32
-<span id="L1177" class="LineNr">1177 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1178" class="LineNr">1178 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L1179" class="LineNr">1179 </span>    <span class="subxComment"># flush(_test-buffered-file)</span>
-<span id="L1180" class="LineNr">1180 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1181" class="LineNr">1181 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L1182" class="LineNr">1182 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1183" class="LineNr">1183 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
-<span id="L1184" class="LineNr">1184 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1185" class="LineNr">1185 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1186" class="LineNr">1186 </span>    <span class="subxComment"># check(_test-stream-&gt;data == 'fe ff ')</span>
-<span id="L1187" class="LineNr">1187 </span>    <span class="subxS1Comment"># . check-ints-equal(_test-stream-&gt;data[0..3], 'fe f', msg)</span>
-<span id="L1188" class="LineNr">1188 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1189" class="LineNr">1189 </span>    68/push  <span class="Constant">&quot;F - <a href='pack.subx.html#L1145'>test-emit-number</a>/1&quot;</span>/imm32
-<span id="L1190" class="LineNr">1190 </span>    68/push  0x66206566/imm32
-<span id="L1191" class="LineNr">1191 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;data</span>
-<span id="L1192" class="LineNr">1192 </span>    b8/copy-to-EAX  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L1193" class="LineNr">1193 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
-<span id="L1194" class="LineNr">1194 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1195" class="LineNr">1195 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L1196" class="LineNr">1196 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1197" class="LineNr">1197 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L1198" class="LineNr">1198 </span>    <span class="subxS1Comment"># . check-ints-equal(_test-stream-&gt;data[4..7], 'f ', msg)</span>
+<span id="L653" class="LineNr"> 653 </span>    b8/copy-to-EAX  <a href='pack.subx.html#L3323'>_test-input-buffered-file</a>/imm32
+<span id="L654" class="LineNr"> 654 </span>    05/add-to-EAX  4/imm32
+<span id="L655" class="LineNr"> 655 </span>    50/push-EAX
+<span id="L656" class="LineNr"> 656 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L657" class="LineNr"> 657 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L658" class="LineNr"> 658 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L659" class="LineNr"> 659 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L660" class="LineNr"> 660 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-stream)</span>
+<span id="L661" class="LineNr"> 661 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L662" class="LineNr"> 662 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L663" class="LineNr"> 663 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L664" class="LineNr"> 664 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L665" class="LineNr"> 665 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L666" class="LineNr"> 666 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L667" class="LineNr"> 667 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-buffered-file+4)</span>
+<span id="L668" class="LineNr"> 668 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L669" class="LineNr"> 669 </span>    b8/copy-to-EAX  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L670" class="LineNr"> 670 </span>    05/add-to-EAX  4/imm32
+<span id="L671" class="LineNr"> 671 </span>    50/push-EAX
+<span id="L672" class="LineNr"> 672 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L673" class="LineNr"> 673 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L674" class="LineNr"> 674 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L675" class="LineNr"> 675 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L676" class="LineNr"> 676 </span>    <span class="subxComment"># initialize input</span>
+<span id="L677" class="LineNr"> 677 </span>    <span class="subxS1Comment"># . write(_test-input-stream, &quot;== code&quot;)</span>
+<span id="L678" class="LineNr"> 678 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L679" class="LineNr"> 679 </span>    68/push  <span class="Constant">&quot;== code&quot;</span>/imm32
+<span id="L680" class="LineNr"> 680 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L681" class="LineNr"> 681 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L682" class="LineNr"> 682 </span>    e8/call  <a href='../057write.subx.html#L24'>write</a>/disp32
+<span id="L683" class="LineNr"> 683 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L684" class="LineNr"> 684 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L685" class="LineNr"> 685 </span>    <span class="subxS1Comment"># . write(_test-input-stream, &quot;\n&quot;)</span>
+<span id="L686" class="LineNr"> 686 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L687" class="LineNr"> 687 </span>    68/push  <span class="SpecialChar"><a href='../051test.subx.html#L83'>Newline</a></span>/imm32
+<span id="L688" class="LineNr"> 688 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L689" class="LineNr"> 689 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L690" class="LineNr"> 690 </span>    e8/call  <a href='../057write.subx.html#L24'>write</a>/disp32
+<span id="L691" class="LineNr"> 691 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L692" class="LineNr"> 692 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L693" class="LineNr"> 693 </span>    <span class="subxS1Comment"># . write(_test-input-stream, &quot;== data&quot;)</span>
+<span id="L694" class="LineNr"> 694 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L695" class="LineNr"> 695 </span>    68/push  <span class="Constant">&quot;== data&quot;</span>/imm32
+<span id="L696" class="LineNr"> 696 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L697" class="LineNr"> 697 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L698" class="LineNr"> 698 </span>    e8/call  <a href='../057write.subx.html#L24'>write</a>/disp32
+<span id="L699" class="LineNr"> 699 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L700" class="LineNr"> 700 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L701" class="LineNr"> 701 </span>    <span class="subxS1Comment"># . write(_test-input-stream, &quot;\n&quot;)</span>
+<span id="L702" class="LineNr"> 702 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L703" class="LineNr"> 703 </span>    68/push  <span class="SpecialChar"><a href='../051test.subx.html#L83'>Newline</a></span>/imm32
+<span id="L704" class="LineNr"> 704 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L705" class="LineNr"> 705 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L706" class="LineNr"> 706 </span>    e8/call  <a href='../057write.subx.html#L24'>write</a>/disp32
+<span id="L707" class="LineNr"> 707 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L708" class="LineNr"> 708 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L709" class="LineNr"> 709 </span>    <span class="subxS1Comment"># . write(_test-input-stream, &quot;3 4/imm32&quot;)</span>
+<span id="L710" class="LineNr"> 710 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L711" class="LineNr"> 711 </span>    68/push  <span class="Constant">&quot;3 4/imm32&quot;</span>/imm32
+<span id="L712" class="LineNr"> 712 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L713" class="LineNr"> 713 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L714" class="LineNr"> 714 </span>    e8/call  <a href='../057write.subx.html#L24'>write</a>/disp32
+<span id="L715" class="LineNr"> 715 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L716" class="LineNr"> 716 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L717" class="LineNr"> 717 </span>    <span class="subxS1Comment"># . write(_test-input-stream, &quot;\n&quot;)</span>
+<span id="L718" class="LineNr"> 718 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L719" class="LineNr"> 719 </span>    68/push  <span class="SpecialChar"><a href='../051test.subx.html#L83'>Newline</a></span>/imm32
+<span id="L720" class="LineNr"> 720 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L721" class="LineNr"> 721 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L722" class="LineNr"> 722 </span>    e8/call  <a href='../057write.subx.html#L24'>write</a>/disp32
+<span id="L723" class="LineNr"> 723 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L724" class="LineNr"> 724 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L725" class="LineNr"> 725 </span>    <span class="subxComment"># convert(_test-input-buffered-file, _test-output-buffered-file)</span>
+<span id="L726" class="LineNr"> 726 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L727" class="LineNr"> 727 </span>    68/push  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L728" class="LineNr"> 728 </span>    68/push  <a href='pack.subx.html#L3323'>_test-input-buffered-file</a>/imm32
+<span id="L729" class="LineNr"> 729 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L730" class="LineNr"> 730 </span>    e8/call  <a href='pack.subx.html#L95'>convert</a>/disp32
+<span id="L731" class="LineNr"> 731 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L732" class="LineNr"> 732 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L733" class="LineNr"> 733 </span>    <span class="subxComment"># check output</span>
+<span id="L734" class="Folded"> 734 </span><span class="Folded">+-- 34 lines: #?     # debug print ---------------------------------------------------------------------------------------------------------------------------</span>
+<span id="L768" class="LineNr"> 768 </span>    <span class="subxS1Comment"># . flush(_test-output-buffered-file)</span>
+<span id="L769" class="LineNr"> 769 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L770" class="LineNr"> 770 </span>    68/push  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L771" class="LineNr"> 771 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L772" class="LineNr"> 772 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
+<span id="L773" class="LineNr"> 773 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L774" class="LineNr"> 774 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L775" class="LineNr"> 775 </span>    <span class="subxS1Comment"># . check-next-stream-line-equal(_test-output-stream, &quot;== code&quot;, msg)</span>
+<span id="L776" class="LineNr"> 776 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L777" class="LineNr"> 777 </span>    68/push  <span class="Constant">&quot;F - <a href='pack.subx.html#L638'>test-convert-in-data-segment</a>/0&quot;</span>/imm32
+<span id="L778" class="LineNr"> 778 </span>    68/push  <span class="Constant">&quot;== code&quot;</span>/imm32
+<span id="L779" class="LineNr"> 779 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L780" class="LineNr"> 780 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L781" class="LineNr"> 781 </span>    e8/call  <a href='../058stream-equal.subx.html#L644'>check-next-stream-line-equal</a>/disp32
+<span id="L782" class="LineNr"> 782 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L783" class="LineNr"> 783 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L784" class="LineNr"> 784 </span>    <span class="subxS1Comment"># . check-next-stream-line-equal(_test-output-stream, &quot;== data&quot;, msg)</span>
+<span id="L785" class="LineNr"> 785 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L786" class="LineNr"> 786 </span>    68/push  <span class="Constant">&quot;F - <a href='pack.subx.html#L638'>test-convert-in-data-segment</a>/1&quot;</span>/imm32
+<span id="L787" class="LineNr"> 787 </span>    68/push  <span class="Constant">&quot;== data&quot;</span>/imm32
+<span id="L788" class="LineNr"> 788 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L789" class="LineNr"> 789 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L790" class="LineNr"> 790 </span>    e8/call  <a href='../058stream-equal.subx.html#L644'>check-next-stream-line-equal</a>/disp32
+<span id="L791" class="LineNr"> 791 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L792" class="LineNr"> 792 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L793" class="LineNr"> 793 </span>    <span class="subxS1Comment"># . check-next-stream-line-equal(_test-output-stream, &quot;03 04 00 00 00 &quot;, msg)</span>
+<span id="L794" class="LineNr"> 794 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L795" class="LineNr"> 795 </span>    68/push  <span class="Constant">&quot;F - <a href='pack.subx.html#L638'>test-convert-in-data-segment</a>/2&quot;</span>/imm32
+<span id="L796" class="LineNr"> 796 </span>    68/push  <span class="Constant">&quot;03 04 00 00 00 &quot;</span>/imm32
+<span id="L797" class="LineNr"> 797 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L798" class="LineNr"> 798 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L799" class="LineNr"> 799 </span>    e8/call  <a href='../058stream-equal.subx.html#L644'>check-next-stream-line-equal</a>/disp32
+<span id="L800" class="LineNr"> 800 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L801" class="LineNr"> 801 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L802" class="LineNr"> 802 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L803" class="LineNr"> 803 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L804" class="LineNr"> 804 </span>    5d/pop-to-EBP
+<span id="L805" class="LineNr"> 805 </span>    c3/return
+<span id="L806" class="LineNr"> 806 </span>
+<span id="L807" class="LineNr"> 807 </span><span class="subxFunction">convert-data</span>:  <span class="subxComment"># line : (address stream byte), out : (address buffered-file) -&gt; &lt;void&gt;</span>
+<span id="L808" class="LineNr"> 808 </span>    <span class="subxComment"># pseudocode:</span>
+<span id="L809" class="LineNr"> 809 </span>    <span class="subxComment">#   while true</span>
+<span id="L810" class="LineNr"> 810 </span>    <span class="subxComment">#     word-slice = next-word(line)</span>
+<span id="L811" class="LineNr"> 811 </span>    <span class="subxComment">#     if slice-empty?(word-slice)                 # end of file (maybe including trailing whitespace)</span>
+<span id="L812" class="LineNr"> 812 </span>    <span class="subxComment">#       break  # skip emitting some whitespace</span>
+<span id="L813" class="LineNr"> 813 </span>    <span class="subxComment">#     if slice-starts-with?(word-slice, &quot;#&quot;)      # comment</span>
+<span id="L814" class="LineNr"> 814 </span>    <span class="subxComment">#       write-stream-buffered(out, line)</span>
+<span id="L815" class="LineNr"> 815 </span>    <span class="subxComment">#       break</span>
+<span id="L816" class="LineNr"> 816 </span>    <span class="subxComment">#     if slice-ends-with?(word-slice, &quot;:&quot;)        # label</span>
+<span id="L817" class="LineNr"> 817 </span>    <span class="subxComment">#       write-stream-buffered(out, line)</span>
+<span id="L818" class="LineNr"> 818 </span>    <span class="subxComment">#       break</span>
+<span id="L819" class="LineNr"> 819 </span>    <span class="subxComment">#     if has-metadata?(word-slice, &quot;imm32&quot;)</span>
+<span id="L820" class="LineNr"> 820 </span>    <span class="subxComment">#       emit(out, word-slice, 4)</span>
+<span id="L821" class="LineNr"> 821 </span>    <span class="subxComment">#     # disp32 is not permitted in data segments, and anything else is only a byte long</span>
+<span id="L822" class="LineNr"> 822 </span>    <span class="subxComment">#     else</span>
+<span id="L823" class="LineNr"> 823 </span>    <span class="subxComment">#       emit(out, word-slice, 1)</span>
+<span id="L824" class="LineNr"> 824 </span>    <span class="subxComment">#</span>
+<span id="L825" class="LineNr"> 825 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L826" class="LineNr"> 826 </span>    55/push-EBP
+<span id="L827" class="LineNr"> 827 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L828" class="LineNr"> 828 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L829" class="LineNr"> 829 </span>    50/push-EAX
+<span id="L830" class="LineNr"> 830 </span>    51/push-ECX
+<span id="L831" class="LineNr"> 831 </span>    52/push-EDX
+<span id="L832" class="LineNr"> 832 </span>    <span class="subxComment"># var word-slice/ECX = {0, 0}</span>
+<span id="L833" class="LineNr"> 833 </span>    68/push  0/imm32/end
+<span id="L834" class="LineNr"> 834 </span>    68/push  0/imm32/start
+<span id="L835" class="LineNr"> 835 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L836" class="Folded"> 836 </span><span class="Folded">+-- 26 lines: #?     # dump line -----------------------------------------------------------------------------------------------------------------------------</span>
+<span id="L862" class="LineNr"> 862 </span><span class="Constant">$convert-data:loop</span>:
+<span id="L863" class="LineNr"> 863 </span>    <span class="subxComment"># next-word(line, word-slice)</span>
+<span id="L864" class="LineNr"> 864 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L865" class="LineNr"> 865 </span>    51/push-ECX
+<span id="L866" class="LineNr"> 866 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L867" class="LineNr"> 867 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L868" class="LineNr"> 868 </span>    e8/call  <a href='pack.subx.html#L1863'>next-word</a>/disp32
+<span id="L869" class="LineNr"> 869 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L870" class="LineNr"> 870 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L871" class="Folded"> 871 </span><span class="Folded">+-- 26 lines: #?     # dump word-slice -----------------------------------------------------------------------------------------------------------------------</span>
+<span id="L897" class="LineNr"> 897 </span><span class="Constant">$convert-data:check0</span>:
+<span id="L898" class="LineNr"> 898 </span>    <span class="subxComment"># if (slice-empty?(word-slice)) break</span>
+<span id="L899" class="LineNr"> 899 </span>    <span class="subxS1Comment"># . EAX = slice-empty?(word-slice)</span>
+<span id="L900" class="LineNr"> 900 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L901" class="LineNr"> 901 </span>    51/push-ECX
+<span id="L902" class="LineNr"> 902 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L903" class="LineNr"> 903 </span>    e8/call  <a href='../072slice.subx.html#L17'>slice-empty?</a>/disp32
+<span id="L904" class="LineNr"> 904 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L905" class="LineNr"> 905 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L906" class="LineNr"> 906 </span>    <span class="subxS1Comment"># . if (EAX != 0) pass through</span>
+<span id="L907" class="LineNr"> 907 </span>    3d/compare-EAX  0/imm32
+<span id="L908" class="LineNr"> 908 </span>    75/jump-if-not-equal  $convert-data:break/disp8
+<span id="L909" class="LineNr"> 909 </span><span class="Constant">$convert-data:check1</span>:
+<span id="L910" class="LineNr"> 910 </span>    <span class="subxComment"># if (slice-starts-with?(word-slice, &quot;#&quot;)) write-stream-buffered(out, line)</span>
+<span id="L911" class="LineNr"> 911 </span>    <span class="subxS1Comment"># . start/EDX = word-slice-&gt;start</span>
+<span id="L912" class="LineNr"> 912 </span>    8b/copy                         0/mod/indirect  1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ECX to EDX</span>
+<span id="L913" class="LineNr"> 913 </span>    <span class="subxS1Comment"># . c/EAX = *start</span>
+<span id="L914" class="LineNr"> 914 </span>    31/xor                          3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EAX</span>
+<span id="L915" class="LineNr"> 915 </span>    8a/copy-byte                    0/mod/indirect  2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/AL   <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *EDX to AL</span>
+<span id="L916" class="LineNr"> 916 </span>    <span class="subxS1Comment"># . if (EAX == '#') pass through</span>
+<span id="L917" class="LineNr"> 917 </span>    3d/compare-with-EAX  0x23/imm32/hash
+<span id="L918" class="LineNr"> 918 </span>    74/jump-if-equal  $convert-data:pass-line-through/disp8
+<span id="L919" class="LineNr"> 919 </span><span class="Constant">$convert-data:check2</span>:
+<span id="L920" class="LineNr"> 920 </span>    <span class="subxComment"># if (slice-ends-with?(word-slice, &quot;:&quot;)) write-stream-buffered(out, line)</span>
+<span id="L921" class="LineNr"> 921 </span>    <span class="subxS1Comment"># . end/EDX = word-slice-&gt;end</span>
+<span id="L922" class="LineNr"> 922 </span>    8b/copy                         1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ECX+4) to EDX</span>
+<span id="L923" class="LineNr"> 923 </span>    <span class="subxS1Comment"># . c/EAX = *(end-1)</span>
+<span id="L924" class="LineNr"> 924 </span>    31/xor                          3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EAX</span>
+<span id="L925" class="LineNr"> 925 </span>    8a/copy-byte                    1/mod/*+disp8   2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/AL    -1/disp8       <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *ECX to AL</span>
+<span id="L926" class="LineNr"> 926 </span>    <span class="subxS1Comment"># . if (EAX == ':') pass through</span>
+<span id="L927" class="LineNr"> 927 </span>    3d/compare-with-EAX  0x3a/imm32/colon
+<span id="L928" class="LineNr"> 928 </span>    74/jump-if-equal  $convert-data:pass-line-through/disp8
+<span id="L929" class="LineNr"> 929 </span><span class="Constant">$convert-data:check3</span>:
+<span id="L930" class="LineNr"> 930 </span>    <span class="subxComment"># if (has-metadata?(word-slice, &quot;imm32&quot;))</span>
+<span id="L931" class="LineNr"> 931 </span>    <span class="subxS1Comment"># . EAX = has-metadata?(ECX, &quot;c&quot;)</span>
+<span id="L932" class="LineNr"> 932 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L933" class="LineNr"> 933 </span>    68/push  <span class="Constant">&quot;imm32&quot;</span>/imm32
+<span id="L934" class="LineNr"> 934 </span>    51/push-ECX
+<span id="L935" class="LineNr"> 935 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L936" class="LineNr"> 936 </span>    e8/call  <a href='pack.subx.html#L2106'>has-metadata?</a>/disp32
+<span id="L937" class="LineNr"> 937 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L938" class="LineNr"> 938 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x8/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L939" class="LineNr"> 939 </span>    <span class="subxS1Comment"># . if (EAX == 0) process as a single byte</span>
+<span id="L940" class="LineNr"> 940 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># compare EAX</span>
+<span id="L941" class="LineNr"> 941 </span>    74/jump-if-equal  $convert-data:single-byte/disp8
+<span id="L942" class="LineNr"> 942 </span><span class="Constant">$convert-data:imm32</span>:
+<span id="L943" class="LineNr"> 943 </span>    <span class="subxComment"># emit(out, word-slice, 4)</span>
+<span id="L944" class="LineNr"> 944 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L945" class="LineNr"> 945 </span>    68/push  4/imm32
+<span id="L946" class="LineNr"> 946 </span>    51/push-ECX
+<span id="L947" class="LineNr"> 947 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L948" class="LineNr"> 948 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L949" class="LineNr"> 949 </span>    e8/call  <a href='pack.subx.html#L2378'>emit</a>/disp32
+<span id="L950" class="LineNr"> 950 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L951" class="LineNr"> 951 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L952" class="LineNr"> 952 </span>    e9/jump  $convert-data:loop/disp32
+<span id="L953" class="LineNr"> 953 </span><span class="Constant">$convert-data:single-byte</span>:
+<span id="L954" class="LineNr"> 954 </span>    <span class="subxComment"># emit(out, word-slice, 1)</span>
+<span id="L955" class="LineNr"> 955 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L956" class="LineNr"> 956 </span>    68/push  1/imm32
+<span id="L957" class="LineNr"> 957 </span>    51/push-ECX
+<span id="L958" class="LineNr"> 958 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L959" class="LineNr"> 959 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L960" class="LineNr"> 960 </span>    e8/call  <a href='pack.subx.html#L2378'>emit</a>/disp32
+<span id="L961" class="LineNr"> 961 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L962" class="LineNr"> 962 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L963" class="LineNr"> 963 </span>    e9/jump  $convert-data:loop/disp32
+<span id="L964" class="LineNr"> 964 </span><span class="Constant">$convert-data:pass-line-through</span>:
+<span id="L965" class="LineNr"> 965 </span>    <span class="subxComment"># write-stream-buffered(out, line)</span>
+<span id="L966" class="LineNr"> 966 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L967" class="LineNr"> 967 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L968" class="LineNr"> 968 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L969" class="LineNr"> 969 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L970" class="LineNr"> 970 </span>    e8/call  <a href='../072slice.subx.html#L803'>write-stream-buffered</a>/disp32
+<span id="L971" class="LineNr"> 971 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L972" class="LineNr"> 972 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L973" class="LineNr"> 973 </span>    <span class="subxComment"># break</span>
+<span id="L974" class="LineNr"> 974 </span><span class="Constant">$convert-data:break</span>:
+<span id="L975" class="LineNr"> 975 </span><span class="Constant">$convert-data:end</span>:
+<span id="L976" class="LineNr"> 976 </span>    <span class="subxS1Comment"># . reclaim locals</span>
+<span id="L977" class="LineNr"> 977 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L978" class="LineNr"> 978 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L979" class="LineNr"> 979 </span>    5a/pop-to-EDX
+<span id="L980" class="LineNr"> 980 </span>    59/pop-to-ECX
+<span id="L981" class="LineNr"> 981 </span>    58/pop-to-EAX
+<span id="L982" class="LineNr"> 982 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L983" class="LineNr"> 983 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L984" class="LineNr"> 984 </span>    5d/pop-to-EBP
+<span id="L985" class="LineNr"> 985 </span>    c3/return
+<span id="L986" class="LineNr"> 986 </span>
+<span id="L987" class="LineNr"> 987 </span><span class="subxTest">test-convert-data-passes-comments-through</span>:
+<span id="L988" class="LineNr"> 988 </span>    <span class="subxComment"># if a line starts with '#', pass it along unchanged</span>
+<span id="L989" class="LineNr"> 989 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L990" class="LineNr"> 990 </span>    55/push-EBP
+<span id="L991" class="LineNr"> 991 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L992" class="LineNr"> 992 </span>    <span class="subxComment"># setup</span>
+<span id="L993" class="LineNr"> 993 </span>    <span class="subxS1Comment"># . clear-stream(_test-input-stream)</span>
+<span id="L994" class="LineNr"> 994 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L995" class="LineNr"> 995 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L996" class="LineNr"> 996 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L997" class="LineNr"> 997 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L998" class="LineNr"> 998 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L999" class="LineNr"> 999 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1000" class="LineNr">1000 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-stream)</span>
+<span id="L1001" class="LineNr">1001 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1002" class="LineNr">1002 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L1003" class="LineNr">1003 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1004" class="LineNr">1004 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1005" class="LineNr">1005 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1006" class="LineNr">1006 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1007" class="LineNr">1007 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-buffered-file+4)</span>
+<span id="L1008" class="LineNr">1008 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1009" class="LineNr">1009 </span>    b8/copy-to-EAX  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L1010" class="LineNr">1010 </span>    05/add-to-EAX  4/imm32
+<span id="L1011" class="LineNr">1011 </span>    50/push-EAX
+<span id="L1012" class="LineNr">1012 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1013" class="LineNr">1013 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1014" class="LineNr">1014 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1015" class="LineNr">1015 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1016" class="LineNr">1016 </span>    <span class="subxComment"># initialize input</span>
+<span id="L1017" class="LineNr">1017 </span>    <span class="subxS1Comment"># . write(_test-input-stream, &quot;# abcd&quot;)</span>
+<span id="L1018" class="LineNr">1018 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1019" class="LineNr">1019 </span>    68/push  <span class="Constant">&quot;# abcd&quot;</span>/imm32
+<span id="L1020" class="LineNr">1020 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L1021" class="LineNr">1021 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1022" class="LineNr">1022 </span>    e8/call  <a href='../057write.subx.html#L24'>write</a>/disp32
+<span id="L1023" class="LineNr">1023 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1024" class="LineNr">1024 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1025" class="LineNr">1025 </span>    <span class="subxComment"># convert-data(_test-input-stream, _test-output-buffered-file)</span>
+<span id="L1026" class="LineNr">1026 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1027" class="LineNr">1027 </span>    68/push  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L1028" class="LineNr">1028 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L1029" class="LineNr">1029 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1030" class="LineNr">1030 </span>    e8/call  <a href='pack.subx.html#L807'>convert-data</a>/disp32
+<span id="L1031" class="LineNr">1031 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1032" class="LineNr">1032 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1033" class="LineNr">1033 </span>    <span class="subxComment"># check that the line just passed through</span>
+<span id="L1034" class="LineNr">1034 </span>    <span class="subxS1Comment"># . flush(_test-output-buffered-file)</span>
+<span id="L1035" class="LineNr">1035 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1036" class="LineNr">1036 </span>    68/push  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L1037" class="LineNr">1037 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1038" class="LineNr">1038 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
+<span id="L1039" class="LineNr">1039 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1040" class="LineNr">1040 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1041" class="LineNr">1041 </span>    <span class="subxS1Comment"># . check-stream-equal(_test-output-stream, &quot;# abcd&quot;, msg)</span>
+<span id="L1042" class="LineNr">1042 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1043" class="LineNr">1043 </span>    68/push  <span class="Constant">&quot;F - test-convert-data-passes-comments-through&quot;</span>/imm32
+<span id="L1044" class="LineNr">1044 </span>    68/push  <span class="Constant">&quot;# abcd&quot;</span>/imm32
+<span id="L1045" class="LineNr">1045 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L1046" class="LineNr">1046 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1047" class="LineNr">1047 </span>    e8/call  <a href='../058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
+<span id="L1048" class="LineNr">1048 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1049" class="LineNr">1049 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L1050" class="LineNr">1050 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L1051" class="LineNr">1051 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L1052" class="LineNr">1052 </span>    5d/pop-to-EBP
+<span id="L1053" class="LineNr">1053 </span>    c3/return
+<span id="L1054" class="LineNr">1054 </span>
+<span id="L1055" class="LineNr">1055 </span><span class="subxTest">test-convert-data-passes-labels-through</span>:
+<span id="L1056" class="LineNr">1056 </span>    <span class="subxComment"># if the first word ends with ':', pass along the entire line unchanged</span>
+<span id="L1057" class="LineNr">1057 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L1058" class="LineNr">1058 </span>    55/push-EBP
+<span id="L1059" class="LineNr">1059 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L1060" class="LineNr">1060 </span>    <span class="subxComment"># setup</span>
+<span id="L1061" class="LineNr">1061 </span>    <span class="subxS1Comment"># . clear-stream(_test-input-stream)</span>
+<span id="L1062" class="LineNr">1062 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1063" class="LineNr">1063 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L1064" class="LineNr">1064 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1065" class="LineNr">1065 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1066" class="LineNr">1066 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1067" class="LineNr">1067 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1068" class="LineNr">1068 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-stream)</span>
+<span id="L1069" class="LineNr">1069 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1070" class="LineNr">1070 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L1071" class="LineNr">1071 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1072" class="LineNr">1072 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1073" class="LineNr">1073 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1074" class="LineNr">1074 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1075" class="LineNr">1075 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-buffered-file+4)</span>
+<span id="L1076" class="LineNr">1076 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1077" class="LineNr">1077 </span>    b8/copy-to-EAX  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L1078" class="LineNr">1078 </span>    05/add-to-EAX  4/imm32
+<span id="L1079" class="LineNr">1079 </span>    50/push-EAX
+<span id="L1080" class="LineNr">1080 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1081" class="LineNr">1081 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1082" class="LineNr">1082 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1083" class="LineNr">1083 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1084" class="LineNr">1084 </span>    <span class="subxComment"># initialize input</span>
+<span id="L1085" class="LineNr">1085 </span>    <span class="subxS1Comment"># . write(_test-input-stream, &quot;ab: # cd&quot;)</span>
+<span id="L1086" class="LineNr">1086 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1087" class="LineNr">1087 </span>    68/push  <span class="Constant">&quot;ab: # cd&quot;</span>/imm32
+<span id="L1088" class="LineNr">1088 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L1089" class="LineNr">1089 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1090" class="LineNr">1090 </span>    e8/call  <a href='../057write.subx.html#L24'>write</a>/disp32
+<span id="L1091" class="LineNr">1091 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1092" class="LineNr">1092 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1093" class="LineNr">1093 </span>    <span class="subxComment"># convert-data(_test-input-stream, _test-output-buffered-file)</span>
+<span id="L1094" class="LineNr">1094 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1095" class="LineNr">1095 </span>    68/push  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L1096" class="LineNr">1096 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L1097" class="LineNr">1097 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1098" class="LineNr">1098 </span>    e8/call  <a href='pack.subx.html#L807'>convert-data</a>/disp32
+<span id="L1099" class="LineNr">1099 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1100" class="LineNr">1100 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1101" class="LineNr">1101 </span>    <span class="subxComment"># check that the line just passed through</span>
+<span id="L1102" class="LineNr">1102 </span>    <span class="subxS1Comment"># . flush(_test-output-buffered-file)</span>
+<span id="L1103" class="LineNr">1103 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1104" class="LineNr">1104 </span>    68/push  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L1105" class="LineNr">1105 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1106" class="LineNr">1106 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
+<span id="L1107" class="LineNr">1107 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1108" class="LineNr">1108 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1109" class="LineNr">1109 </span>    <span class="subxS1Comment"># . check-stream-equal(_test-output-stream, &quot;ab: # cd&quot;, msg)</span>
+<span id="L1110" class="LineNr">1110 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1111" class="LineNr">1111 </span>    68/push  <span class="Constant">&quot;F - test-convert-data-passes-labels-through&quot;</span>/imm32
+<span id="L1112" class="LineNr">1112 </span>    68/push  <span class="Constant">&quot;ab: # cd&quot;</span>/imm32
+<span id="L1113" class="LineNr">1113 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L1114" class="LineNr">1114 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1115" class="LineNr">1115 </span>    e8/call  <a href='../058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
+<span id="L1116" class="LineNr">1116 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1117" class="LineNr">1117 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L1118" class="LineNr">1118 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L1119" class="LineNr">1119 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L1120" class="LineNr">1120 </span>    5d/pop-to-EBP
+<span id="L1121" class="LineNr">1121 </span>    c3/return
+<span id="L1122" class="LineNr">1122 </span>
+<span id="L1123" class="LineNr">1123 </span><span class="subxTest">test-convert-data-passes-names-through</span>:
+<span id="L1124" class="LineNr">1124 </span>    <span class="subxComment"># If a word is a valid name, just emit it unchanged.</span>
+<span id="L1125" class="LineNr">1125 </span>    <span class="subxComment"># Later phases will deal with it.</span>
+<span id="L1126" class="LineNr">1126 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L1127" class="LineNr">1127 </span>    55/push-EBP
+<span id="L1128" class="LineNr">1128 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L1129" class="LineNr">1129 </span>    <span class="subxComment"># setup</span>
+<span id="L1130" class="LineNr">1130 </span>    <span class="subxS1Comment"># . clear-stream(_test-input-stream)</span>
+<span id="L1131" class="LineNr">1131 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1132" class="LineNr">1132 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L1133" class="LineNr">1133 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1134" class="LineNr">1134 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1135" class="LineNr">1135 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1136" class="LineNr">1136 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1137" class="LineNr">1137 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-stream)</span>
+<span id="L1138" class="LineNr">1138 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1139" class="LineNr">1139 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L1140" class="LineNr">1140 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1141" class="LineNr">1141 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1142" class="LineNr">1142 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1143" class="LineNr">1143 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1144" class="LineNr">1144 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-buffered-file+4)</span>
+<span id="L1145" class="LineNr">1145 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1146" class="LineNr">1146 </span>    b8/copy-to-EAX  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L1147" class="LineNr">1147 </span>    05/add-to-EAX  4/imm32
+<span id="L1148" class="LineNr">1148 </span>    50/push-EAX
+<span id="L1149" class="LineNr">1149 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1150" class="LineNr">1150 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1151" class="LineNr">1151 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1152" class="LineNr">1152 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1153" class="LineNr">1153 </span>    <span class="subxComment"># initialize input</span>
+<span id="L1154" class="LineNr">1154 </span>    <span class="subxS1Comment"># . write(_test-input-stream, &quot;abcd/imm32&quot;)</span>
+<span id="L1155" class="LineNr">1155 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1156" class="LineNr">1156 </span>    68/push  <span class="Constant">&quot;abcd/imm32&quot;</span>/imm32
+<span id="L1157" class="LineNr">1157 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L1158" class="LineNr">1158 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1159" class="LineNr">1159 </span>    e8/call  <a href='../057write.subx.html#L24'>write</a>/disp32
+<span id="L1160" class="LineNr">1160 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1161" class="LineNr">1161 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1162" class="LineNr">1162 </span>    <span class="subxComment"># convert-data(_test-input-stream, _test-output-buffered-file)</span>
+<span id="L1163" class="LineNr">1163 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1164" class="LineNr">1164 </span>    68/push  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L1165" class="LineNr">1165 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L1166" class="LineNr">1166 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1167" class="LineNr">1167 </span>    e8/call  <a href='pack.subx.html#L807'>convert-data</a>/disp32
+<span id="L1168" class="LineNr">1168 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1169" class="LineNr">1169 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1170" class="LineNr">1170 </span>    <span class="subxComment"># check that the line just passed through</span>
+<span id="L1171" class="LineNr">1171 </span>    <span class="subxS1Comment"># . flush(_test-output-buffered-file)</span>
+<span id="L1172" class="LineNr">1172 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1173" class="LineNr">1173 </span>    68/push  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L1174" class="LineNr">1174 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1175" class="LineNr">1175 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
+<span id="L1176" class="LineNr">1176 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1177" class="LineNr">1177 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1178" class="LineNr">1178 </span>    <span class="subxS1Comment"># . check-stream-equal(_test-output-stream, &quot;abcd/imm32&quot;, msg)</span>
+<span id="L1179" class="LineNr">1179 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1180" class="LineNr">1180 </span>    68/push  <span class="Constant">&quot;F - test-convert-data-passes-names-through&quot;</span>/imm32
+<span id="L1181" class="LineNr">1181 </span>    68/push  <span class="Constant">&quot;abcd/imm32 &quot;</span>/imm32
+<span id="L1182" class="LineNr">1182 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L1183" class="LineNr">1183 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1184" class="LineNr">1184 </span>    e8/call  <a href='../058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
+<span id="L1185" class="LineNr">1185 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1186" class="LineNr">1186 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L1187" class="LineNr">1187 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L1188" class="LineNr">1188 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L1189" class="LineNr">1189 </span>    5d/pop-to-EBP
+<span id="L1190" class="LineNr">1190 </span>    c3/return
+<span id="L1191" class="LineNr">1191 </span>
+<span id="L1192" class="LineNr">1192 </span><span class="subxTest">test-convert-data-handles-imm32</span>:
+<span id="L1193" class="LineNr">1193 </span>    <span class="subxComment"># If a word has the /imm32 metadata, emit it in 4 bytes.</span>
+<span id="L1194" class="LineNr">1194 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L1195" class="LineNr">1195 </span>    55/push-EBP
+<span id="L1196" class="LineNr">1196 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L1197" class="LineNr">1197 </span>    <span class="subxComment"># setup</span>
+<span id="L1198" class="LineNr">1198 </span>    <span class="subxS1Comment"># . clear-stream(_test-input-stream)</span>
 <span id="L1199" class="LineNr">1199 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1200" class="LineNr">1200 </span>    68/push  <span class="Constant">&quot;F - <a href='pack.subx.html#L1145'>test-emit-number</a>/2&quot;</span>/imm32
-<span id="L1201" class="LineNr">1201 </span>    68/push  0x2066/imm32
-<span id="L1202" class="LineNr">1202 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;data</span>
-<span id="L1203" class="LineNr">1203 </span>    b8/copy-to-EAX  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L1204" class="LineNr">1204 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+16)</span>
-<span id="L1205" class="LineNr">1205 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1206" class="LineNr">1206 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L1207" class="LineNr">1207 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1208" class="LineNr">1208 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L1209" class="LineNr">1209 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L1210" class="LineNr">1210 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L1211" class="LineNr">1211 </span>    5d/pop-to-EBP
-<span id="L1212" class="LineNr">1212 </span>    c3/return
-<span id="L1213" class="LineNr">1213 </span>
-<span id="L1214" class="LineNr">1214 </span><span class="subxTest">test-emit-number-with-metadata</span>:
-<span id="L1215" class="LineNr">1215 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L1216" class="LineNr">1216 </span>    55/push-EBP
-<span id="L1217" class="LineNr">1217 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L1218" class="LineNr">1218 </span>    <span class="subxComment"># setup</span>
-<span id="L1219" class="LineNr">1219 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
-<span id="L1220" class="LineNr">1220 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1221" class="LineNr">1221 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L1222" class="LineNr">1222 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1223" class="LineNr">1223 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L1224" class="LineNr">1224 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1225" class="LineNr">1225 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1226" class="LineNr">1226 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
-<span id="L1227" class="LineNr">1227 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1228" class="LineNr">1228 </span>    b8/copy-to-EAX  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L1229" class="LineNr">1229 </span>    05/add-to-EAX  4/imm32
-<span id="L1230" class="LineNr">1230 </span>    50/push-EAX
-<span id="L1231" class="LineNr">1231 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1232" class="LineNr">1232 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L1233" class="LineNr">1233 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1234" class="LineNr">1234 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1235" class="LineNr">1235 </span>    <span class="subxComment"># var slice/ECX = &quot;-2/foo&quot;</span>
-<span id="L1236" class="LineNr">1236 </span>    68/push  <a href='pack.subx.html#L1690'>_test-slice-negative-two-metadata-end</a>/imm32/end
-<span id="L1237" class="LineNr">1237 </span>    68/push  <a href='pack.subx.html#L1686'>_test-slice-negative-two</a>/imm32/start
-<span id="L1238" class="LineNr">1238 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
-<span id="L1239" class="LineNr">1239 </span>    <span class="subxComment"># emit(_test-buffered-file, slice, 2)</span>
+<span id="L1200" class="LineNr">1200 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L1201" class="LineNr">1201 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1202" class="LineNr">1202 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1203" class="LineNr">1203 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1204" class="LineNr">1204 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1205" class="LineNr">1205 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-stream)</span>
+<span id="L1206" class="LineNr">1206 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1207" class="LineNr">1207 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L1208" class="LineNr">1208 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1209" class="LineNr">1209 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1210" class="LineNr">1210 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1211" class="LineNr">1211 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1212" class="LineNr">1212 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-buffered-file+4)</span>
+<span id="L1213" class="LineNr">1213 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1214" class="LineNr">1214 </span>    b8/copy-to-EAX  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L1215" class="LineNr">1215 </span>    05/add-to-EAX  4/imm32
+<span id="L1216" class="LineNr">1216 </span>    50/push-EAX
+<span id="L1217" class="LineNr">1217 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1218" class="LineNr">1218 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1219" class="LineNr">1219 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1220" class="LineNr">1220 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1221" class="LineNr">1221 </span>    <span class="subxComment"># initialize input</span>
+<span id="L1222" class="LineNr">1222 </span>    <span class="subxS1Comment"># . write(_test-input-stream, &quot;30/imm32&quot;)</span>
+<span id="L1223" class="LineNr">1223 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1224" class="LineNr">1224 </span>    68/push  <span class="Constant">&quot;30/imm32&quot;</span>/imm32
+<span id="L1225" class="LineNr">1225 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L1226" class="LineNr">1226 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1227" class="LineNr">1227 </span>    e8/call  <a href='../057write.subx.html#L24'>write</a>/disp32
+<span id="L1228" class="LineNr">1228 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1229" class="LineNr">1229 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1230" class="LineNr">1230 </span>    <span class="subxComment"># convert-data(_test-input-stream, _test-output-buffered-file)</span>
+<span id="L1231" class="LineNr">1231 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1232" class="LineNr">1232 </span>    68/push  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L1233" class="LineNr">1233 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L1234" class="LineNr">1234 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1235" class="LineNr">1235 </span>    e8/call  <a href='pack.subx.html#L807'>convert-data</a>/disp32
+<span id="L1236" class="LineNr">1236 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1237" class="LineNr">1237 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1238" class="LineNr">1238 </span>    <span class="subxComment"># check that 4 bytes were written</span>
+<span id="L1239" class="LineNr">1239 </span>    <span class="subxS1Comment"># . flush(_test-output-buffered-file)</span>
 <span id="L1240" class="LineNr">1240 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1241" class="LineNr">1241 </span>    68/push  2/imm32
-<span id="L1242" class="LineNr">1242 </span>    51/push-ECX
-<span id="L1243" class="LineNr">1243 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L1244" class="LineNr">1244 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1245" class="LineNr">1245 </span>    e8/call  <a href='pack.subx.html#L1070'>emit</a>/disp32
-<span id="L1246" class="LineNr">1246 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1247" class="LineNr">1247 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L1248" class="LineNr">1248 </span>    <span class="subxComment"># flush(_test-buffered-file)</span>
-<span id="L1249" class="LineNr">1249 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1250" class="LineNr">1250 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L1241" class="LineNr">1241 </span>    68/push  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L1242" class="LineNr">1242 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1243" class="LineNr">1243 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
+<span id="L1244" class="LineNr">1244 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1245" class="LineNr">1245 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1246" class="LineNr">1246 </span>    <span class="subxS1Comment"># . check-stream-equal(_test-output-stream, &quot;30 00 00 00 &quot;, msg)</span>
+<span id="L1247" class="LineNr">1247 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1248" class="LineNr">1248 </span>    68/push  <span class="Constant">&quot;F - test-convert-data-handles-imm32&quot;</span>/imm32
+<span id="L1249" class="LineNr">1249 </span>    68/push  <span class="Constant">&quot;30 00 00 00 &quot;</span>/imm32
+<span id="L1250" class="LineNr">1250 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
 <span id="L1251" class="LineNr">1251 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1252" class="LineNr">1252 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
+<span id="L1252" class="LineNr">1252 </span>    e8/call  <a href='../058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
 <span id="L1253" class="LineNr">1253 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1254" class="LineNr">1254 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1255" class="LineNr">1255 </span>    <span class="subxComment"># the '/foo' will have no impact on the output</span>
-<span id="L1256" class="LineNr">1256 </span>    <span class="subxComment"># check(_test-stream-&gt;data == 'fe ff ')</span>
-<span id="L1257" class="LineNr">1257 </span>    <span class="subxS1Comment"># . check-ints-equal(_test-stream-&gt;data[0..3], 'fe f', msg)</span>
-<span id="L1258" class="LineNr">1258 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1259" class="LineNr">1259 </span>    68/push  <span class="Constant">&quot;F - <a href='pack.subx.html#L1214'>test-emit-number-with-metadata</a>/1&quot;</span>/imm32
-<span id="L1260" class="LineNr">1260 </span>    68/push  0x66206566/imm32
-<span id="L1261" class="LineNr">1261 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;data</span>
-<span id="L1262" class="LineNr">1262 </span>    b8/copy-to-EAX  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L1263" class="LineNr">1263 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
-<span id="L1264" class="LineNr">1264 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1265" class="LineNr">1265 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L1266" class="LineNr">1266 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1267" class="LineNr">1267 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L1268" class="LineNr">1268 </span>    <span class="subxS1Comment"># . check-ints-equal(_test-stream-&gt;data[4..7], 'f ', msg)</span>
-<span id="L1269" class="LineNr">1269 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1270" class="LineNr">1270 </span>    68/push  <span class="Constant">&quot;F - <a href='pack.subx.html#L1214'>test-emit-number-with-metadata</a>/2&quot;</span>/imm32
-<span id="L1271" class="LineNr">1271 </span>    68/push  0x2066/imm32
-<span id="L1272" class="LineNr">1272 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;data</span>
-<span id="L1273" class="LineNr">1273 </span>    b8/copy-to-EAX  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L1274" class="LineNr">1274 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+16)</span>
-<span id="L1275" class="LineNr">1275 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1276" class="LineNr">1276 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L1277" class="LineNr">1277 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1278" class="LineNr">1278 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L1279" class="LineNr">1279 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L1280" class="LineNr">1280 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L1281" class="LineNr">1281 </span>    5d/pop-to-EBP
-<span id="L1282" class="LineNr">1282 </span>    c3/return
-<span id="L1283" class="LineNr">1283 </span>
-<span id="L1284" class="LineNr">1284 </span><span class="subxTest">test-emit-non-number</span>:
-<span id="L1285" class="LineNr">1285 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L1286" class="LineNr">1286 </span>    55/push-EBP
-<span id="L1287" class="LineNr">1287 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L1288" class="LineNr">1288 </span>    <span class="subxComment"># setup</span>
-<span id="L1289" class="LineNr">1289 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
-<span id="L1290" class="LineNr">1290 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1291" class="LineNr">1291 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L1292" class="LineNr">1292 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1293" class="LineNr">1293 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L1294" class="LineNr">1294 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1295" class="LineNr">1295 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1296" class="LineNr">1296 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
-<span id="L1297" class="LineNr">1297 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1298" class="LineNr">1298 </span>    b8/copy-to-EAX  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L1299" class="LineNr">1299 </span>    05/add-to-EAX  4/imm32
-<span id="L1300" class="LineNr">1300 </span>    50/push-EAX
-<span id="L1301" class="LineNr">1301 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1302" class="LineNr">1302 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L1303" class="LineNr">1303 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1304" class="LineNr">1304 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1305" class="LineNr">1305 </span>    <span class="subxComment"># var slice/ECX = &quot;xyz&quot;</span>
-<span id="L1306" class="LineNr">1306 </span>    68/push  <a href='pack.subx.html#L1694'>_test-slice-non-number-word-end</a>/imm32/end
-<span id="L1307" class="LineNr">1307 </span>    68/push  <a href='pack.subx.html#L1692'>_test-slice-non-number-word</a>/imm32/start
-<span id="L1308" class="LineNr">1308 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
-<span id="L1309" class="LineNr">1309 </span>    <span class="subxComment"># emit(_test-buffered-file, slice, 2)</span>
-<span id="L1310" class="LineNr">1310 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1311" class="LineNr">1311 </span>    68/push  2/imm32
-<span id="L1312" class="LineNr">1312 </span>    51/push-ECX
-<span id="L1313" class="LineNr">1313 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L1314" class="LineNr">1314 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1315" class="LineNr">1315 </span>    e8/call  <a href='pack.subx.html#L1070'>emit</a>/disp32
-<span id="L1316" class="LineNr">1316 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1317" class="LineNr">1317 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L1318" class="LineNr">1318 </span>    <span class="subxComment"># flush(_test-buffered-file)</span>
-<span id="L1319" class="LineNr">1319 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1320" class="LineNr">1320 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L1321" class="LineNr">1321 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1322" class="LineNr">1322 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
-<span id="L1323" class="LineNr">1323 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1324" class="LineNr">1324 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1325" class="LineNr">1325 </span>    <span class="subxComment"># check(_test-stream-&gt;data == 'xyz')</span>
-<span id="L1326" class="LineNr">1326 </span>    <span class="subxS1Comment"># . check-ints-equal(_test-stream-&gt;data[0..3], 'xyz', msg)</span>
-<span id="L1327" class="LineNr">1327 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1328" class="LineNr">1328 </span>    68/push  <span class="Constant">&quot;F - test-emit-non-number&quot;</span>/imm32
-<span id="L1329" class="LineNr">1329 </span>    68/push  0x7a7978/imm32
-<span id="L1330" class="LineNr">1330 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;data</span>
-<span id="L1331" class="LineNr">1331 </span>    b8/copy-to-EAX  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L1332" class="LineNr">1332 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
-<span id="L1333" class="LineNr">1333 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1334" class="LineNr">1334 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L1335" class="LineNr">1335 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1336" class="LineNr">1336 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L1337" class="LineNr">1337 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L1338" class="LineNr">1338 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L1339" class="LineNr">1339 </span>    5d/pop-to-EBP
-<span id="L1340" class="LineNr">1340 </span>    c3/return
-<span id="L1341" class="LineNr">1341 </span>
-<span id="L1342" class="LineNr">1342 </span><span class="subxTest">test-emit-non-number-with-metadata</span>:
-<span id="L1343" class="LineNr">1343 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L1344" class="LineNr">1344 </span>    55/push-EBP
-<span id="L1345" class="LineNr">1345 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L1346" class="LineNr">1346 </span>    <span class="subxComment"># setup</span>
-<span id="L1347" class="LineNr">1347 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
-<span id="L1348" class="LineNr">1348 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1349" class="LineNr">1349 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L1350" class="LineNr">1350 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1351" class="LineNr">1351 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L1352" class="LineNr">1352 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1353" class="LineNr">1353 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1354" class="LineNr">1354 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
-<span id="L1355" class="LineNr">1355 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1356" class="LineNr">1356 </span>    b8/copy-to-EAX  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L1357" class="LineNr">1357 </span>    05/add-to-EAX  4/imm32
-<span id="L1358" class="LineNr">1358 </span>    50/push-EAX
-<span id="L1359" class="LineNr">1359 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1360" class="LineNr">1360 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L1361" class="LineNr">1361 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1362" class="LineNr">1362 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1363" class="LineNr">1363 </span>    <span class="subxComment"># var slice/ECX = &quot;xyz/&quot;</span>
-<span id="L1364" class="LineNr">1364 </span>    68/push  <a href='pack.subx.html#L1696'>_test-slice-non-number-word-metadata-end</a>/imm32/end
-<span id="L1365" class="LineNr">1365 </span>    68/push  <a href='pack.subx.html#L1692'>_test-slice-non-number-word</a>/imm32/start
-<span id="L1366" class="LineNr">1366 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
-<span id="L1367" class="LineNr">1367 </span>    <span class="subxComment"># emit(_test-buffered-file, slice, 2)</span>
+<span id="L1254" class="LineNr">1254 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L1255" class="LineNr">1255 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L1256" class="LineNr">1256 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L1257" class="LineNr">1257 </span>    5d/pop-to-EBP
+<span id="L1258" class="LineNr">1258 </span>    c3/return
+<span id="L1259" class="LineNr">1259 </span>
+<span id="L1260" class="LineNr">1260 </span><span class="subxTest">test-convert-data-handles-single-byte</span>:
+<span id="L1261" class="LineNr">1261 </span>    <span class="subxComment"># Any metadata but /imm32 will emit a single byte.</span>
+<span id="L1262" class="LineNr">1262 </span>    <span class="subxComment"># Data segments can't have /disp32, and SubX doesn't support 16-bit operands.</span>
+<span id="L1263" class="LineNr">1263 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L1264" class="LineNr">1264 </span>    55/push-EBP
+<span id="L1265" class="LineNr">1265 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L1266" class="LineNr">1266 </span>    <span class="subxComment"># setup</span>
+<span id="L1267" class="LineNr">1267 </span>    <span class="subxS1Comment"># . clear-stream(_test-input-stream)</span>
+<span id="L1268" class="LineNr">1268 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1269" class="LineNr">1269 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L1270" class="LineNr">1270 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1271" class="LineNr">1271 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1272" class="LineNr">1272 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1273" class="LineNr">1273 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1274" class="LineNr">1274 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-stream)</span>
+<span id="L1275" class="LineNr">1275 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1276" class="LineNr">1276 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L1277" class="LineNr">1277 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1278" class="LineNr">1278 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1279" class="LineNr">1279 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1280" class="LineNr">1280 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1281" class="LineNr">1281 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-buffered-file+4)</span>
+<span id="L1282" class="LineNr">1282 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1283" class="LineNr">1283 </span>    b8/copy-to-EAX  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L1284" class="LineNr">1284 </span>    05/add-to-EAX  4/imm32
+<span id="L1285" class="LineNr">1285 </span>    50/push-EAX
+<span id="L1286" class="LineNr">1286 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1287" class="LineNr">1287 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1288" class="LineNr">1288 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1289" class="LineNr">1289 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1290" class="LineNr">1290 </span>    <span class="subxComment"># initialize input</span>
+<span id="L1291" class="LineNr">1291 </span>    <span class="subxS1Comment"># . write(_test-input-stream, &quot;30/imm16&quot;)</span>
+<span id="L1292" class="LineNr">1292 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1293" class="LineNr">1293 </span>    68/push  <span class="Constant">&quot;30/imm16&quot;</span>/imm32
+<span id="L1294" class="LineNr">1294 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L1295" class="LineNr">1295 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1296" class="LineNr">1296 </span>    e8/call  <a href='../057write.subx.html#L24'>write</a>/disp32
+<span id="L1297" class="LineNr">1297 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1298" class="LineNr">1298 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1299" class="LineNr">1299 </span>    <span class="subxComment"># convert-data(_test-input-stream, _test-output-buffered-file)</span>
+<span id="L1300" class="LineNr">1300 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1301" class="LineNr">1301 </span>    68/push  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L1302" class="LineNr">1302 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L1303" class="LineNr">1303 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1304" class="LineNr">1304 </span>    e8/call  <a href='pack.subx.html#L807'>convert-data</a>/disp32
+<span id="L1305" class="LineNr">1305 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1306" class="LineNr">1306 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1307" class="LineNr">1307 </span>    <span class="subxComment"># check that a single byte was written (imm16 is not a valid operand type)</span>
+<span id="L1308" class="LineNr">1308 </span>    <span class="subxS1Comment"># . flush(_test-output-buffered-file)</span>
+<span id="L1309" class="LineNr">1309 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1310" class="LineNr">1310 </span>    68/push  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L1311" class="LineNr">1311 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1312" class="LineNr">1312 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
+<span id="L1313" class="LineNr">1313 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1314" class="LineNr">1314 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1315" class="LineNr">1315 </span>    <span class="subxS1Comment"># . check-stream-equal(_test-output-stream, &quot;30 &quot;, msg)</span>
+<span id="L1316" class="LineNr">1316 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1317" class="LineNr">1317 </span>    68/push  <span class="Constant">&quot;F - test-convert-data-handles-single-byte&quot;</span>/imm32
+<span id="L1318" class="LineNr">1318 </span>    68/push  <span class="Constant">&quot;30 &quot;</span>/imm32
+<span id="L1319" class="LineNr">1319 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L1320" class="LineNr">1320 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1321" class="LineNr">1321 </span>    e8/call  <a href='../058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
+<span id="L1322" class="LineNr">1322 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1323" class="LineNr">1323 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L1324" class="LineNr">1324 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L1325" class="LineNr">1325 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L1326" class="LineNr">1326 </span>    5d/pop-to-EBP
+<span id="L1327" class="LineNr">1327 </span>    c3/return
+<span id="L1328" class="LineNr">1328 </span>
+<span id="L1329" class="LineNr">1329 </span><span class="subxTest">test-convert-data-multiple-bytes</span>:
+<span id="L1330" class="LineNr">1330 </span>    <span class="subxComment"># Multiple single-byte words in input stream get processed one by one.</span>
+<span id="L1331" class="LineNr">1331 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L1332" class="LineNr">1332 </span>    55/push-EBP
+<span id="L1333" class="LineNr">1333 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L1334" class="LineNr">1334 </span>    <span class="subxComment"># setup</span>
+<span id="L1335" class="LineNr">1335 </span>    <span class="subxS1Comment"># . clear-stream(_test-input-stream)</span>
+<span id="L1336" class="LineNr">1336 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1337" class="LineNr">1337 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L1338" class="LineNr">1338 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1339" class="LineNr">1339 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1340" class="LineNr">1340 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1341" class="LineNr">1341 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1342" class="LineNr">1342 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-stream)</span>
+<span id="L1343" class="LineNr">1343 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1344" class="LineNr">1344 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L1345" class="LineNr">1345 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1346" class="LineNr">1346 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1347" class="LineNr">1347 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1348" class="LineNr">1348 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1349" class="LineNr">1349 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-buffered-file+4)</span>
+<span id="L1350" class="LineNr">1350 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1351" class="LineNr">1351 </span>    b8/copy-to-EAX  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L1352" class="LineNr">1352 </span>    05/add-to-EAX  4/imm32
+<span id="L1353" class="LineNr">1353 </span>    50/push-EAX
+<span id="L1354" class="LineNr">1354 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1355" class="LineNr">1355 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1356" class="LineNr">1356 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1357" class="LineNr">1357 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1358" class="LineNr">1358 </span>    <span class="subxComment"># initialize input</span>
+<span id="L1359" class="LineNr">1359 </span>    <span class="subxS1Comment"># . write(_test-input-stream, &quot;1 2&quot;)</span>
+<span id="L1360" class="LineNr">1360 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1361" class="LineNr">1361 </span>    68/push  <span class="Constant">&quot;1 2&quot;</span>/imm32
+<span id="L1362" class="LineNr">1362 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L1363" class="LineNr">1363 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1364" class="LineNr">1364 </span>    e8/call  <a href='../057write.subx.html#L24'>write</a>/disp32
+<span id="L1365" class="LineNr">1365 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1366" class="LineNr">1366 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1367" class="LineNr">1367 </span>    <span class="subxComment"># convert-data(_test-input-stream, _test-output-buffered-file)</span>
 <span id="L1368" class="LineNr">1368 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1369" class="LineNr">1369 </span>    68/push  2/imm32
-<span id="L1370" class="LineNr">1370 </span>    51/push-ECX
-<span id="L1371" class="LineNr">1371 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L1372" class="LineNr">1372 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1373" class="LineNr">1373 </span>    e8/call  <a href='pack.subx.html#L1070'>emit</a>/disp32
-<span id="L1374" class="LineNr">1374 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1375" class="LineNr">1375 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L1376" class="LineNr">1376 </span>    <span class="subxComment"># flush(_test-buffered-file)</span>
+<span id="L1369" class="LineNr">1369 </span>    68/push  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L1370" class="LineNr">1370 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L1371" class="LineNr">1371 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1372" class="LineNr">1372 </span>    e8/call  <a href='pack.subx.html#L807'>convert-data</a>/disp32
+<span id="L1373" class="LineNr">1373 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1374" class="LineNr">1374 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1375" class="LineNr">1375 </span>    <span class="subxComment"># check output</span>
+<span id="L1376" class="LineNr">1376 </span>    <span class="subxS1Comment"># . flush(_test-output-buffered-file)</span>
 <span id="L1377" class="LineNr">1377 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1378" class="LineNr">1378 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L1378" class="LineNr">1378 </span>    68/push  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
 <span id="L1379" class="LineNr">1379 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L1380" class="LineNr">1380 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
 <span id="L1381" class="LineNr">1381 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L1382" class="LineNr">1382 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1383" class="LineNr">1383 </span>    <span class="subxComment"># check(_test-stream-&gt;data == 'xyz/')</span>
-<span id="L1384" class="LineNr">1384 </span>    <span class="subxS1Comment"># . check-ints-equal(_test-stream-&gt;data[0..3], 'xyz/', msg)</span>
-<span id="L1385" class="LineNr">1385 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1386" class="LineNr">1386 </span>    68/push  <span class="Constant">&quot;F - test-emit-non-number-with-metadata&quot;</span>/imm32
-<span id="L1387" class="LineNr">1387 </span>    68/push  0x2f7a7978/imm32
-<span id="L1388" class="LineNr">1388 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;data</span>
-<span id="L1389" class="LineNr">1389 </span>    b8/copy-to-EAX  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L1390" class="LineNr">1390 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
-<span id="L1391" class="LineNr">1391 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1392" class="LineNr">1392 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L1393" class="LineNr">1393 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1394" class="LineNr">1394 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L1395" class="LineNr">1395 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L1396" class="LineNr">1396 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L1397" class="LineNr">1397 </span>    5d/pop-to-EBP
-<span id="L1398" class="LineNr">1398 </span>    c3/return
-<span id="L1399" class="LineNr">1399 </span>
-<span id="L1400" class="LineNr">1400 </span><span class="subxComment"># print 'n' in hex in 'width' bytes in lower-endian order, with a space after every byte</span>
-<span id="L1401" class="LineNr">1401 </span><span class="subxFunction">emit-hex</span>:  <span class="subxComment"># out : (address buffered-file), n : int, width : int</span>
-<span id="L1402" class="LineNr">1402 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L1403" class="LineNr">1403 </span>    55/push-EBP
-<span id="L1404" class="LineNr">1404 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L1405" class="LineNr">1405 </span>    <span class="subxS1Comment"># . save registers</span>
-<span id="L1406" class="LineNr">1406 </span>    50/push-EAX
-<span id="L1407" class="LineNr">1407 </span>    51/push-ECX
-<span id="L1408" class="LineNr">1408 </span>    52/push-EDX
-<span id="L1409" class="LineNr">1409 </span>    53/push-EBX
-<span id="L1410" class="LineNr">1410 </span>    57/push-EDI
-<span id="L1411" class="LineNr">1411 </span>    <span class="subxComment"># EDI = out</span>
-<span id="L1412" class="LineNr">1412 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          7/r32/EDI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EDI</span>
-<span id="L1413" class="LineNr">1413 </span>    <span class="subxComment"># EBX = n</span>
-<span id="L1414" class="LineNr">1414 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EBX</span>
-<span id="L1415" class="LineNr">1415 </span>    <span class="subxComment"># EDX = width</span>
-<span id="L1416" class="LineNr">1416 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+16) to EDX</span>
-<span id="L1417" class="LineNr">1417 </span>    <span class="subxComment"># var curr/ECX = 0</span>
-<span id="L1418" class="LineNr">1418 </span>    31/xor                          3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear ECX</span>
-<span id="L1419" class="LineNr">1419 </span><span class="Constant">$emit-hex:loop</span>:
-<span id="L1420" class="LineNr">1420 </span>    <span class="subxComment"># if (curr &gt;= width) break</span>
-<span id="L1421" class="LineNr">1421 </span>    39/compare                      3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare ECX and EDX</span>
-<span id="L1422" class="LineNr">1422 </span>    7d/jump-if-greater-or-equal  $emit-hex:end/disp8
-<span id="L1423" class="LineNr">1423 </span>    <span class="subxComment"># print-byte(out, EBX)</span>
-<span id="L1424" class="LineNr">1424 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1425" class="LineNr">1425 </span>    53/push-EBX
-<span id="L1426" class="LineNr">1426 </span>    57/push-EDI
-<span id="L1427" class="LineNr">1427 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1428" class="LineNr">1428 </span>    e8/call  <a href='../066print-byte.subx.html#L8'>print-byte</a>/disp32
-<span id="L1429" class="LineNr">1429 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1430" class="LineNr">1430 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1431" class="LineNr">1431 </span>    <span class="subxComment"># write-byte(out, ' ')</span>
-<span id="L1432" class="LineNr">1432 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1433" class="LineNr">1433 </span>    68/push  0x20/imm32/space
-<span id="L1434" class="LineNr">1434 </span>    57/push-EDI
-<span id="L1435" class="LineNr">1435 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1436" class="LineNr">1436 </span>    e8/call  <a href='../064write-byte.subx.html#L31'>write-byte</a>/disp32
-<span id="L1437" class="LineNr">1437 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1438" class="LineNr">1438 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1439" class="LineNr">1439 </span>    <span class="subxComment"># EBX = EBX &gt;&gt; 8</span>
-<span id="L1440" class="LineNr">1440 </span>    c1/shift    5/subop/logic-right 3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm8            <span class="subxComment"># shift EBX right by 8 bits, while padding zeroes</span>
-<span id="L1441" class="LineNr">1441 </span>    <span class="subxComment"># ++curr</span>
-<span id="L1442" class="LineNr">1442 </span>    41/increment-ECX
-<span id="L1443" class="LineNr">1443 </span>    eb/jump  $emit-hex:loop/disp8
-<span id="L1444" class="LineNr">1444 </span><span class="Constant">$emit-hex:end</span>:
-<span id="L1445" class="LineNr">1445 </span>    <span class="subxS1Comment"># . restore registers</span>
-<span id="L1446" class="LineNr">1446 </span>    5f/pop-to-EDI
-<span id="L1447" class="LineNr">1447 </span>    5b/pop-to-EBX
-<span id="L1448" class="LineNr">1448 </span>    5a/pop-to-EAX
-<span id="L1449" class="LineNr">1449 </span>    59/pop-to-ECX
-<span id="L1450" class="LineNr">1450 </span>    58/pop-to-EAX
-<span id="L1451" class="LineNr">1451 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L1452" class="LineNr">1452 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L1453" class="LineNr">1453 </span>    5d/pop-to-EBP
-<span id="L1454" class="LineNr">1454 </span>    c3/return
-<span id="L1455" class="LineNr">1455 </span>
-<span id="L1456" class="LineNr">1456 </span><span class="subxTest">test-emit-hex-single-byte</span>:
-<span id="L1457" class="LineNr">1457 </span>    <span class="subxComment"># setup</span>
-<span id="L1458" class="LineNr">1458 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
-<span id="L1459" class="LineNr">1459 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1460" class="LineNr">1460 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L1461" class="LineNr">1461 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1462" class="LineNr">1462 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L1463" class="LineNr">1463 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1464" class="LineNr">1464 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1465" class="LineNr">1465 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
-<span id="L1466" class="LineNr">1466 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1467" class="LineNr">1467 </span>    b8/copy-to-EAX  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L1468" class="LineNr">1468 </span>    05/add-to-EAX  4/imm32
-<span id="L1469" class="LineNr">1469 </span>    50/push-EAX
-<span id="L1470" class="LineNr">1470 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1471" class="LineNr">1471 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L1472" class="LineNr">1472 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1473" class="LineNr">1473 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1474" class="LineNr">1474 </span>    <span class="subxComment"># emit-hex(_test-buffered-file, 0xab, 1)</span>
-<span id="L1475" class="LineNr">1475 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1476" class="LineNr">1476 </span>    68/push  1/imm32
-<span id="L1477" class="LineNr">1477 </span>    68/push  0xab/imm32
-<span id="L1478" class="LineNr">1478 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L1479" class="LineNr">1479 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1480" class="LineNr">1480 </span>    e8/call  <a href='pack.subx.html#L1401'>emit-hex</a>/disp32
-<span id="L1481" class="LineNr">1481 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1482" class="LineNr">1482 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L1483" class="LineNr">1483 </span>    <span class="subxComment"># flush(_test-buffered-file)</span>
-<span id="L1484" class="LineNr">1484 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1485" class="LineNr">1485 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L1486" class="LineNr">1486 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1487" class="LineNr">1487 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
-<span id="L1488" class="LineNr">1488 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1489" class="LineNr">1489 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1490" class="LineNr">1490 </span>    <span class="subxComment"># check-ints-equal(*_test-stream-&gt;data, 'ab ', msg)</span>
-<span id="L1491" class="LineNr">1491 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1492" class="LineNr">1492 </span>    68/push  <span class="Constant">&quot;F - test-emit-hex-single-byte&quot;</span>/imm32
-<span id="L1493" class="LineNr">1493 </span>    68/push  0x206261/imm32
-<span id="L1494" class="LineNr">1494 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;data</span>
-<span id="L1495" class="LineNr">1495 </span>    b8/copy-to-EAX  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L1496" class="LineNr">1496 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
-<span id="L1497" class="LineNr">1497 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1498" class="LineNr">1498 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L1499" class="LineNr">1499 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1500" class="LineNr">1500 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L1501" class="LineNr">1501 </span>    <span class="subxS1Comment"># . end</span>
-<span id="L1502" class="LineNr">1502 </span>    c3/return
-<span id="L1503" class="LineNr">1503 </span>
-<span id="L1504" class="LineNr">1504 </span><span class="subxTest">test-emit-hex-multiple-byte</span>:
-<span id="L1505" class="LineNr">1505 </span>    <span class="subxComment"># setup</span>
-<span id="L1506" class="LineNr">1506 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
-<span id="L1507" class="LineNr">1507 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1508" class="LineNr">1508 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L1509" class="LineNr">1509 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1510" class="LineNr">1510 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L1511" class="LineNr">1511 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1512" class="LineNr">1512 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1513" class="LineNr">1513 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
-<span id="L1514" class="LineNr">1514 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1515" class="LineNr">1515 </span>    b8/copy-to-EAX  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L1516" class="LineNr">1516 </span>    05/add-to-EAX  4/imm32
-<span id="L1517" class="LineNr">1517 </span>    50/push-EAX
-<span id="L1518" class="LineNr">1518 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1519" class="LineNr">1519 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L1520" class="LineNr">1520 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1521" class="LineNr">1521 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1522" class="LineNr">1522 </span>    <span class="subxComment"># emit-hex(_test-buffered-file, 0x1234, 2)</span>
-<span id="L1523" class="LineNr">1523 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1524" class="LineNr">1524 </span>    68/push  2/imm32
-<span id="L1525" class="LineNr">1525 </span>    68/push  0x1234/imm32
-<span id="L1526" class="LineNr">1526 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L1527" class="LineNr">1527 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1528" class="LineNr">1528 </span>    e8/call  <a href='pack.subx.html#L1401'>emit-hex</a>/disp32
-<span id="L1529" class="LineNr">1529 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1530" class="LineNr">1530 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L1531" class="LineNr">1531 </span>    <span class="subxComment"># flush(_test-buffered-file)</span>
-<span id="L1532" class="LineNr">1532 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1533" class="LineNr">1533 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L1534" class="LineNr">1534 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1535" class="LineNr">1535 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
-<span id="L1536" class="LineNr">1536 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1537" class="LineNr">1537 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1538" class="LineNr">1538 </span>    <span class="subxComment"># check(_test-stream-&gt;data == '34 12 ')</span>
-<span id="L1539" class="LineNr">1539 </span>    <span class="subxS1Comment"># . check-ints-equal(_test-stream-&gt;data[0..3], '34 1', msg)</span>
-<span id="L1540" class="LineNr">1540 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1541" class="LineNr">1541 </span>    68/push  <span class="Constant">&quot;F - <a href='pack.subx.html#L1504'>test-emit-hex-multiple-byte</a>/1&quot;</span>/imm32
-<span id="L1542" class="LineNr">1542 </span>    68/push  0x31203433/imm32
-<span id="L1543" class="LineNr">1543 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;data</span>
-<span id="L1544" class="LineNr">1544 </span>    b8/copy-to-EAX  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L1545" class="LineNr">1545 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
-<span id="L1546" class="LineNr">1546 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1547" class="LineNr">1547 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L1548" class="LineNr">1548 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1549" class="LineNr">1549 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L1550" class="LineNr">1550 </span>    <span class="subxS1Comment"># . check-ints-equal(_test-stream-&gt;data[4..7], '2 ', msg)</span>
-<span id="L1551" class="LineNr">1551 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1552" class="LineNr">1552 </span>    68/push  <span class="Constant">&quot;F - <a href='pack.subx.html#L1504'>test-emit-hex-multiple-byte</a>/2&quot;</span>/imm32
-<span id="L1553" class="LineNr">1553 </span>    68/push  0x2032/imm32
-<span id="L1554" class="LineNr">1554 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;data</span>
-<span id="L1555" class="LineNr">1555 </span>    b8/copy-to-EAX  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L1556" class="LineNr">1556 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+16)</span>
-<span id="L1557" class="LineNr">1557 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1558" class="LineNr">1558 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L1559" class="LineNr">1559 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1560" class="LineNr">1560 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L1561" class="LineNr">1561 </span>    <span class="subxS1Comment"># . end</span>
-<span id="L1562" class="LineNr">1562 </span>    c3/return
-<span id="L1563" class="LineNr">1563 </span>
-<span id="L1564" class="LineNr">1564 </span><span class="subxTest">test-emit-hex-zero-pad</span>:
-<span id="L1565" class="LineNr">1565 </span>    <span class="subxComment"># setup</span>
-<span id="L1566" class="LineNr">1566 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
-<span id="L1567" class="LineNr">1567 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1568" class="LineNr">1568 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L1569" class="LineNr">1569 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1570" class="LineNr">1570 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L1571" class="LineNr">1571 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1572" class="LineNr">1572 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1573" class="LineNr">1573 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
-<span id="L1574" class="LineNr">1574 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1575" class="LineNr">1575 </span>    b8/copy-to-EAX  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L1576" class="LineNr">1576 </span>    05/add-to-EAX  4/imm32
-<span id="L1577" class="LineNr">1577 </span>    50/push-EAX
-<span id="L1578" class="LineNr">1578 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1579" class="LineNr">1579 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L1580" class="LineNr">1580 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1581" class="LineNr">1581 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1582" class="LineNr">1582 </span>    <span class="subxComment"># emit-hex(_test-buffered-file, 0xab, 2)</span>
-<span id="L1583" class="LineNr">1583 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1584" class="LineNr">1584 </span>    68/push  2/imm32
-<span id="L1585" class="LineNr">1585 </span>    68/push  0xab/imm32
-<span id="L1586" class="LineNr">1586 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L1587" class="LineNr">1587 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1588" class="LineNr">1588 </span>    e8/call  <a href='pack.subx.html#L1401'>emit-hex</a>/disp32
-<span id="L1589" class="LineNr">1589 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1590" class="LineNr">1590 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L1591" class="LineNr">1591 </span>    <span class="subxComment"># flush(_test-buffered-file)</span>
-<span id="L1592" class="LineNr">1592 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1593" class="LineNr">1593 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L1594" class="LineNr">1594 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1595" class="LineNr">1595 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
-<span id="L1596" class="LineNr">1596 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1597" class="LineNr">1597 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1598" class="LineNr">1598 </span>    <span class="subxComment"># check(_test-stream-&gt;data == '00 ab')</span>
-<span id="L1599" class="LineNr">1599 </span>    <span class="subxS1Comment"># . check-ints-equal(*_test-stream-&gt;data, 'ab 0', msg)</span>
-<span id="L1600" class="LineNr">1600 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1601" class="LineNr">1601 </span>    68/push  <span class="Constant">&quot;F - <a href='pack.subx.html#L1564'>test-emit-hex-zero-pad</a>/1&quot;</span>/imm32
-<span id="L1602" class="LineNr">1602 </span>    68/push  0x30206261/imm32
-<span id="L1603" class="LineNr">1603 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;data</span>
-<span id="L1604" class="LineNr">1604 </span>    b8/copy-to-EAX  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L1605" class="LineNr">1605 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
-<span id="L1606" class="LineNr">1606 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1607" class="LineNr">1607 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L1608" class="LineNr">1608 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1609" class="LineNr">1609 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L1610" class="LineNr">1610 </span>    <span class="subxS1Comment"># . check-ints-equal(*_test-stream-&gt;data[1], '0 ', msg)</span>
-<span id="L1611" class="LineNr">1611 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1612" class="LineNr">1612 </span>    68/push  <span class="Constant">&quot;F - <a href='pack.subx.html#L1564'>test-emit-hex-zero-pad</a>/2&quot;</span>/imm32
-<span id="L1613" class="LineNr">1613 </span>    68/push  0x2030/imm32
-<span id="L1614" class="LineNr">1614 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;data</span>
-<span id="L1615" class="LineNr">1615 </span>    b8/copy-to-EAX  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L1616" class="LineNr">1616 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+16)</span>
-<span id="L1617" class="LineNr">1617 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1618" class="LineNr">1618 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L1619" class="LineNr">1619 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1620" class="LineNr">1620 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L1621" class="LineNr">1621 </span>    <span class="subxS1Comment"># . end</span>
-<span id="L1622" class="LineNr">1622 </span>    c3/return
-<span id="L1623" class="LineNr">1623 </span>
-<span id="L1624" class="LineNr">1624 </span><span class="subxTest">test-emit-hex-negative</span>:
-<span id="L1625" class="LineNr">1625 </span>    <span class="subxComment"># setup</span>
-<span id="L1626" class="LineNr">1626 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
-<span id="L1627" class="LineNr">1627 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1628" class="LineNr">1628 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L1629" class="LineNr">1629 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1630" class="LineNr">1630 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L1631" class="LineNr">1631 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1632" class="LineNr">1632 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1633" class="LineNr">1633 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
-<span id="L1634" class="LineNr">1634 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1635" class="LineNr">1635 </span>    b8/copy-to-EAX  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L1636" class="LineNr">1636 </span>    05/add-to-EAX  4/imm32
-<span id="L1637" class="LineNr">1637 </span>    50/push-EAX
-<span id="L1638" class="LineNr">1638 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1639" class="LineNr">1639 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
-<span id="L1640" class="LineNr">1640 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1641" class="LineNr">1641 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1642" class="LineNr">1642 </span>    <span class="subxComment"># emit-hex(_test-buffered-file, -1, 2)</span>
-<span id="L1643" class="LineNr">1643 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1644" class="LineNr">1644 </span>    68/push  2/imm32
-<span id="L1645" class="LineNr">1645 </span>    68/push  -1/imm32
-<span id="L1646" class="LineNr">1646 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L1647" class="LineNr">1647 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1648" class="LineNr">1648 </span>    e8/call  <a href='pack.subx.html#L1401'>emit-hex</a>/disp32
-<span id="L1649" class="LineNr">1649 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1650" class="LineNr">1650 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L1651" class="LineNr">1651 </span>    <span class="subxComment"># flush(_test-buffered-file)</span>
-<span id="L1652" class="LineNr">1652 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1653" class="LineNr">1653 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
-<span id="L1654" class="LineNr">1654 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1655" class="LineNr">1655 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
-<span id="L1656" class="LineNr">1656 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1657" class="LineNr">1657 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L1658" class="LineNr">1658 </span>    <span class="subxComment"># check(_test-stream-&gt;data == 'ff ff ')</span>
-<span id="L1659" class="LineNr">1659 </span>    <span class="subxS1Comment"># . check-ints-equal(_test-stream-&gt;data[0..3], 'ff f', msg)</span>
-<span id="L1660" class="LineNr">1660 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1661" class="LineNr">1661 </span>    68/push  <span class="Constant">&quot;F - <a href='pack.subx.html#L1624'>test-emit-hex-negative</a>/1&quot;</span>/imm32
-<span id="L1662" class="LineNr">1662 </span>    68/push  0x66206666/imm32
-<span id="L1663" class="LineNr">1663 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;data</span>
-<span id="L1664" class="LineNr">1664 </span>    b8/copy-to-EAX  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L1665" class="LineNr">1665 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
-<span id="L1666" class="LineNr">1666 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1667" class="LineNr">1667 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L1668" class="LineNr">1668 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1669" class="LineNr">1669 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L1670" class="LineNr">1670 </span>    <span class="subxS1Comment"># . check-ints-equal(_test-stream-&gt;data[4..7], 'f ', msg)</span>
-<span id="L1671" class="LineNr">1671 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1672" class="LineNr">1672 </span>    68/push  <span class="Constant">&quot;F - <a href='pack.subx.html#L1624'>test-emit-hex-negative</a>/2&quot;</span>/imm32
-<span id="L1673" class="LineNr">1673 </span>    68/push  0x2066/imm32
-<span id="L1674" class="LineNr">1674 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;data</span>
-<span id="L1675" class="LineNr">1675 </span>    b8/copy-to-EAX  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
-<span id="L1676" class="LineNr">1676 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+16)</span>
-<span id="L1677" class="LineNr">1677 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1678" class="LineNr">1678 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L1679" class="LineNr">1679 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1680" class="LineNr">1680 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L1681" class="LineNr">1681 </span>    <span class="subxS1Comment"># . end</span>
-<span id="L1682" class="LineNr">1682 </span>    c3/return
-<span id="L1683" class="LineNr">1683 </span>
-<span id="L1684" class="LineNr">1684 </span>== data
-<span id="L1685" class="LineNr">1685 </span>
-<span id="L1686" class="LineNr">1686 </span><span class="subxMinorFunction">_test-slice-negative-two</span>:
-<span id="L1687" class="LineNr">1687 </span>    2d/- 32/2
-<span id="L1688" class="LineNr">1688 </span><span class="subxMinorFunction">_test-slice-negative-two-end</span>:
-<span id="L1689" class="LineNr">1689 </span>    2f/slash 66/f 6f/o 6f/o
-<span id="L1690" class="LineNr">1690 </span><span class="subxMinorFunction">_test-slice-negative-two-metadata-end</span>:
-<span id="L1691" class="LineNr">1691 </span>
-<span id="L1692" class="LineNr">1692 </span><span class="subxMinorFunction">_test-slice-non-number-word</span>:
-<span id="L1693" class="LineNr">1693 </span>    78/x 79/y 7a/z
-<span id="L1694" class="LineNr">1694 </span><span class="subxMinorFunction">_test-slice-non-number-word-end</span>:
-<span id="L1695" class="LineNr">1695 </span>    2f/slash
-<span id="L1696" class="LineNr">1696 </span><span class="subxMinorFunction">_test-slice-non-number-word-metadata-end</span>:
-<span id="L1697" class="LineNr">1697 </span>
-<span id="L1698" class="LineNr">1698 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
+<span id="L1383" class="LineNr">1383 </span>    <span class="subxS1Comment"># . check-stream-equal(_test-output-stream, &quot;01 02 &quot;, msg)</span>
+<span id="L1384" class="LineNr">1384 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1385" class="LineNr">1385 </span>    68/push  <span class="Constant">&quot;F - test-convert-data-multiple-bytes&quot;</span>/imm32
+<span id="L1386" class="LineNr">1386 </span>    68/push  <span class="Constant">&quot;01 02 &quot;</span>/imm32
+<span id="L1387" class="LineNr">1387 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L1388" class="LineNr">1388 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1389" class="LineNr">1389 </span>    e8/call  <a href='../058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
+<span id="L1390" class="LineNr">1390 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1391" class="LineNr">1391 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L1392" class="LineNr">1392 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L1393" class="LineNr">1393 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L1394" class="LineNr">1394 </span>    5d/pop-to-EBP
+<span id="L1395" class="LineNr">1395 </span>    c3/return
+<span id="L1396" class="LineNr">1396 </span>
+<span id="L1397" class="LineNr">1397 </span><span class="subxTest">test-convert-data-byte-then-name</span>:
+<span id="L1398" class="LineNr">1398 </span>    <span class="subxComment"># Single-byte word followed by valid name get processed one by one.</span>
+<span id="L1399" class="LineNr">1399 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L1400" class="LineNr">1400 </span>    55/push-EBP
+<span id="L1401" class="LineNr">1401 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L1402" class="LineNr">1402 </span>    <span class="subxComment"># setup</span>
+<span id="L1403" class="LineNr">1403 </span>    <span class="subxS1Comment"># . clear-stream(_test-input-stream)</span>
+<span id="L1404" class="LineNr">1404 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1405" class="LineNr">1405 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L1406" class="LineNr">1406 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1407" class="LineNr">1407 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1408" class="LineNr">1408 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1409" class="LineNr">1409 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1410" class="LineNr">1410 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-stream)</span>
+<span id="L1411" class="LineNr">1411 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1412" class="LineNr">1412 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L1413" class="LineNr">1413 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1414" class="LineNr">1414 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1415" class="LineNr">1415 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1416" class="LineNr">1416 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1417" class="LineNr">1417 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-buffered-file+4)</span>
+<span id="L1418" class="LineNr">1418 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1419" class="LineNr">1419 </span>    b8/copy-to-EAX  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L1420" class="LineNr">1420 </span>    05/add-to-EAX  4/imm32
+<span id="L1421" class="LineNr">1421 </span>    50/push-EAX
+<span id="L1422" class="LineNr">1422 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1423" class="LineNr">1423 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1424" class="LineNr">1424 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1425" class="LineNr">1425 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1426" class="LineNr">1426 </span>    <span class="subxComment"># initialize input</span>
+<span id="L1427" class="LineNr">1427 </span>    <span class="subxS1Comment"># . write(_test-input-stream, &quot;30 abcd/o&quot;)</span>
+<span id="L1428" class="LineNr">1428 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1429" class="LineNr">1429 </span>    68/push  <span class="Constant">&quot;30 abcd/o&quot;</span>/imm32
+<span id="L1430" class="LineNr">1430 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L1431" class="LineNr">1431 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1432" class="LineNr">1432 </span>    e8/call  <a href='../057write.subx.html#L24'>write</a>/disp32
+<span id="L1433" class="LineNr">1433 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1434" class="LineNr">1434 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1435" class="LineNr">1435 </span>    <span class="subxComment"># convert-data(_test-input-stream, _test-output-buffered-file)</span>
+<span id="L1436" class="LineNr">1436 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1437" class="LineNr">1437 </span>    68/push  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L1438" class="LineNr">1438 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L1439" class="LineNr">1439 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1440" class="LineNr">1440 </span>    e8/call  <a href='pack.subx.html#L807'>convert-data</a>/disp32
+<span id="L1441" class="LineNr">1441 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1442" class="LineNr">1442 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1443" class="LineNr">1443 </span>    <span class="subxComment"># check output</span>
+<span id="L1444" class="LineNr">1444 </span>    <span class="subxS1Comment"># . flush(_test-output-buffered-file)</span>
+<span id="L1445" class="LineNr">1445 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1446" class="LineNr">1446 </span>    68/push  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L1447" class="LineNr">1447 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1448" class="LineNr">1448 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
+<span id="L1449" class="LineNr">1449 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1450" class="LineNr">1450 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1451" class="LineNr">1451 </span>    <span class="subxS1Comment"># . check-stream-equal(_test-output-stream, &quot;30 abcd/o &quot;, msg)</span>
+<span id="L1452" class="LineNr">1452 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1453" class="LineNr">1453 </span>    68/push  <span class="Constant">&quot;F - test-convert-data-byte-then-name&quot;</span>/imm32
+<span id="L1454" class="LineNr">1454 </span>    68/push  <span class="Constant">&quot;30 abcd/o &quot;</span>/imm32
+<span id="L1455" class="LineNr">1455 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L1456" class="LineNr">1456 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1457" class="LineNr">1457 </span>    e8/call  <a href='../058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
+<span id="L1458" class="LineNr">1458 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1459" class="LineNr">1459 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L1460" class="LineNr">1460 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L1461" class="LineNr">1461 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L1462" class="LineNr">1462 </span>    5d/pop-to-EBP
+<span id="L1463" class="LineNr">1463 </span>    c3/return
+<span id="L1464" class="LineNr">1464 </span>
+<span id="L1465" class="LineNr">1465 </span><span class="subxTest">test-convert-data-multiple-words</span>:
+<span id="L1466" class="LineNr">1466 </span>    <span class="subxComment"># Multiple words in input stream get processed one by one.</span>
+<span id="L1467" class="LineNr">1467 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L1468" class="LineNr">1468 </span>    55/push-EBP
+<span id="L1469" class="LineNr">1469 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L1470" class="LineNr">1470 </span>    <span class="subxComment"># setup</span>
+<span id="L1471" class="LineNr">1471 </span>    <span class="subxS1Comment"># . clear-stream(_test-input-stream)</span>
+<span id="L1472" class="LineNr">1472 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1473" class="LineNr">1473 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L1474" class="LineNr">1474 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1475" class="LineNr">1475 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1476" class="LineNr">1476 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1477" class="LineNr">1477 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1478" class="LineNr">1478 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-stream)</span>
+<span id="L1479" class="LineNr">1479 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1480" class="LineNr">1480 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L1481" class="LineNr">1481 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1482" class="LineNr">1482 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1483" class="LineNr">1483 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1484" class="LineNr">1484 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1485" class="LineNr">1485 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-buffered-file+4)</span>
+<span id="L1486" class="LineNr">1486 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1487" class="LineNr">1487 </span>    b8/copy-to-EAX  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L1488" class="LineNr">1488 </span>    05/add-to-EAX  4/imm32
+<span id="L1489" class="LineNr">1489 </span>    50/push-EAX
+<span id="L1490" class="LineNr">1490 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1491" class="LineNr">1491 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1492" class="LineNr">1492 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1493" class="LineNr">1493 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1494" class="LineNr">1494 </span>    <span class="subxComment"># initialize input</span>
+<span id="L1495" class="LineNr">1495 </span>    <span class="subxS1Comment"># . write(_test-input-stream, &quot;30 abcd/o 42e1/imm32&quot;)</span>
+<span id="L1496" class="LineNr">1496 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1497" class="LineNr">1497 </span>    68/push  <span class="Constant">&quot;30 abcd/o 42e1/imm32&quot;</span>/imm32
+<span id="L1498" class="LineNr">1498 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L1499" class="LineNr">1499 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1500" class="LineNr">1500 </span>    e8/call  <a href='../057write.subx.html#L24'>write</a>/disp32
+<span id="L1501" class="LineNr">1501 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1502" class="LineNr">1502 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1503" class="LineNr">1503 </span>    <span class="subxComment"># convert-data(_test-input-stream, _test-output-buffered-file)</span>
+<span id="L1504" class="LineNr">1504 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1505" class="LineNr">1505 </span>    68/push  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L1506" class="LineNr">1506 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L1507" class="LineNr">1507 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1508" class="LineNr">1508 </span>    e8/call  <a href='pack.subx.html#L807'>convert-data</a>/disp32
+<span id="L1509" class="LineNr">1509 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1510" class="LineNr">1510 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1511" class="LineNr">1511 </span>    <span class="subxComment"># check output</span>
+<span id="L1512" class="LineNr">1512 </span>    <span class="subxS1Comment"># . flush(_test-output-buffered-file)</span>
+<span id="L1513" class="LineNr">1513 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1514" class="LineNr">1514 </span>    68/push  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L1515" class="LineNr">1515 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1516" class="LineNr">1516 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
+<span id="L1517" class="LineNr">1517 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1518" class="LineNr">1518 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1519" class="Folded">1519 </span><span class="Folded">+-- 34 lines: # dump output ----------------------------------------------------------------------------------------------------------------------------------</span>
+<span id="L1553" class="LineNr">1553 </span>    <span class="subxS1Comment"># . check-stream-equal(_test-output-stream, &quot;30 abcd/o 42 e1 00 00 &quot;, msg)</span>
+<span id="L1554" class="LineNr">1554 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1555" class="LineNr">1555 </span>    68/push  <span class="Constant">&quot;F - test-convert-data-multiple-words&quot;</span>/imm32
+<span id="L1556" class="LineNr">1556 </span>    68/push  <span class="Constant">&quot;30 abcd/o e1 42 00 00 &quot;</span>/imm32
+<span id="L1557" class="LineNr">1557 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L1558" class="LineNr">1558 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1559" class="LineNr">1559 </span>    e8/call  <a href='../058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
+<span id="L1560" class="LineNr">1560 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1561" class="LineNr">1561 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L1562" class="LineNr">1562 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L1563" class="LineNr">1563 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L1564" class="LineNr">1564 </span>    5d/pop-to-EBP
+<span id="L1565" class="LineNr">1565 </span>    c3/return
+<span id="L1566" class="LineNr">1566 </span>
+<span id="L1567" class="LineNr">1567 </span><span class="subxComment"># simplifications since we perform zero error handling (continuing to rely on the C++ version for that):</span>
+<span id="L1568" class="LineNr">1568 </span><span class="subxComment">#   missing fields are always 0-filled</span>
+<span id="L1569" class="LineNr">1569 </span><span class="subxComment">#   bytes never mentioned are silently dropped; if you don't provide /mod, /rm32 or /r32 you don't get a 0 modrm byte. You get *no* modrm byte.</span>
+<span id="L1570" class="LineNr">1570 </span><span class="subxComment">#   in case of conflict, last operand with a name is recognized</span>
+<span id="L1571" class="LineNr">1571 </span><span class="subxComment">#   silently drop extraneous operands</span>
+<span id="L1572" class="LineNr">1572 </span><span class="subxComment">#   unceremoniously abort on non-numeric operands except disp or imm</span>
+<span id="L1573" class="LineNr">1573 </span><span class="subxComment">#   opcodes must be lowercase and zero padded</span>
+<span id="L1574" class="LineNr">1574 </span>
+<span id="L1575" class="LineNr">1575 </span><span class="subxComment"># todo: end each line with original unprocessed line in a comment</span>
+<span id="L1576" class="LineNr">1576 </span>
+<span id="L1577" class="LineNr">1577 </span><span class="subxComment"># pack an instruction, following the C++ version:</span>
+<span id="L1578" class="LineNr">1578 </span><span class="subxFunction">convert-instruction</span>:  <span class="subxComment"># line : (address stream byte), out : (address buffered-file) -&gt; &lt;void&gt;</span>
+<span id="L1579" class="LineNr">1579 </span>    <span class="subxComment"># pseudocode:</span>
+<span id="L1580" class="LineNr">1580 </span>    <span class="subxComment">#   var word-slice = next-word(line)</span>
+<span id="L1581" class="LineNr">1581 </span>    <span class="subxComment">#   if slice-empty?(word-slice)</span>
+<span id="L1582" class="LineNr">1582 </span>    <span class="subxComment">#     write-stream-buffered(out, line)</span>
+<span id="L1583" class="LineNr">1583 </span>    <span class="subxComment">#     return</span>
+<span id="L1584" class="LineNr">1584 </span>    <span class="subxComment">#   if slice-starts-with?(word-slice, &quot;#&quot;)</span>
+<span id="L1585" class="LineNr">1585 </span>    <span class="subxComment">#     write-stream-buffered(out, line)</span>
+<span id="L1586" class="LineNr">1586 </span>    <span class="subxComment">#     return</span>
+<span id="L1587" class="LineNr">1587 </span>    <span class="subxComment">#   if slice-ends-with?(word-slice, &quot;:&quot;)</span>
+<span id="L1588" class="LineNr">1588 </span>    <span class="subxComment">#     write-stream-buffered(out, line)</span>
+<span id="L1589" class="LineNr">1589 </span>    <span class="subxComment">#     return</span>
+<span id="L1590" class="LineNr">1590 </span>    <span class="subxComment">#   # convert opcodes</span>
+<span id="L1591" class="LineNr">1591 </span>    <span class="subxComment">#   var op1 = word-slice</span>
+<span id="L1592" class="LineNr">1592 </span>    <span class="subxComment">#   write-slice(out, op1)</span>
+<span id="L1593" class="LineNr">1593 </span>    <span class="subxComment">#   if slice-equal?(op1, &quot;0f&quot;) or slice-equal?(op1, &quot;f2&quot;) or slice-equal?(op1, &quot;f3&quot;)</span>
+<span id="L1594" class="LineNr">1594 </span>    <span class="subxComment">#     var op2 = next-word(line)</span>
+<span id="L1595" class="LineNr">1595 </span>    <span class="subxComment">#     if slice-empty?(op2)</span>
+<span id="L1596" class="LineNr">1596 </span>    <span class="subxComment">#       return</span>
+<span id="L1597" class="LineNr">1597 </span>    <span class="subxComment">#     if slice-starts-with?(op2, &quot;#&quot;)</span>
+<span id="L1598" class="LineNr">1598 </span>    <span class="subxComment">#       return</span>
+<span id="L1599" class="LineNr">1599 </span>    <span class="subxComment">#     write-slice(out, op2)</span>
+<span id="L1600" class="LineNr">1600 </span>    <span class="subxComment">#     if slice-equal?(op1, &quot;f2&quot;) or slice-equal?(op1, &quot;f3&quot;)</span>
+<span id="L1601" class="LineNr">1601 </span>    <span class="subxComment">#       if slice-equal?(op2, &quot;0f&quot;)</span>
+<span id="L1602" class="LineNr">1602 </span>    <span class="subxComment">#         var op3 = next-word(line)</span>
+<span id="L1603" class="LineNr">1603 </span>    <span class="subxComment">#         if slice-empty?(op3)</span>
+<span id="L1604" class="LineNr">1604 </span>    <span class="subxComment">#           return</span>
+<span id="L1605" class="LineNr">1605 </span>    <span class="subxComment">#         if slice-starts-with?(op2, &quot;#&quot;)</span>
+<span id="L1606" class="LineNr">1606 </span>    <span class="subxComment">#           return</span>
+<span id="L1607" class="LineNr">1607 </span>    <span class="subxComment">#         write-slice(out, op3)</span>
+<span id="L1608" class="LineNr">1608 </span>    <span class="subxComment">#   # pack modrm and sib</span>
+<span id="L1609" class="LineNr">1609 </span>    <span class="subxComment">#   var has-modrm? = false, mod = 0, rm32 = 0, r32 = 0</span>
+<span id="L1610" class="LineNr">1610 </span>    <span class="subxComment">#   var has-sib? = false, base = 0, index = 4 (none), scale = 0</span>
+<span id="L1611" class="LineNr">1611 </span>    <span class="subxComment">#   while true</span>
+<span id="L1612" class="LineNr">1612 </span>    <span class="subxComment">#     word-slice = next-word(line)</span>
+<span id="L1613" class="LineNr">1613 </span>    <span class="subxComment">#     if (empty(word-slice)) break</span>
+<span id="L1614" class="LineNr">1614 </span>    <span class="subxComment">#     if (slice-starts-with?(word-slice, &quot;#&quot;)) break</span>
+<span id="L1615" class="LineNr">1615 </span>    <span class="subxComment">#     if (has-metadata?(word-slice, &quot;mod&quot;))</span>
+<span id="L1616" class="LineNr">1616 </span>    <span class="subxComment">#       var mod = parse-hex-int(next-token-from-slice(word-slice, &quot;/&quot;))</span>
+<span id="L1617" class="LineNr">1617 </span>    <span class="subxComment">#       has-modrm? = true</span>
+<span id="L1618" class="LineNr">1618 </span>    <span class="subxComment">#     else if (has-metadata?(word-slice, &quot;rm32&quot;))</span>
+<span id="L1619" class="LineNr">1619 </span>    <span class="subxComment">#       var rm32 = parse-hex-int(next-token-from-slice(word-slice, &quot;/&quot;))</span>
+<span id="L1620" class="LineNr">1620 </span>    <span class="subxComment">#       has-modrm? = true</span>
+<span id="L1621" class="LineNr">1621 </span>    <span class="subxComment">#     else if (has-metadata?(word-slice, &quot;r32&quot;) or has-metadata?(word-slice, &quot;subop&quot;))</span>
+<span id="L1622" class="LineNr">1622 </span>    <span class="subxComment">#       var r32 = parse-hex-int(next-token-from-slice(word-slice, &quot;/&quot;))</span>
+<span id="L1623" class="LineNr">1623 </span>    <span class="subxComment">#       has-modrm? = true</span>
+<span id="L1624" class="LineNr">1624 </span>    <span class="subxComment">#     else if (has-metadata?(word-slice, &quot;base&quot;)</span>
+<span id="L1625" class="LineNr">1625 </span>    <span class="subxComment">#       var base = parse-hex-int(next-token-from-slice(word-slice, &quot;/&quot;))</span>
+<span id="L1626" class="LineNr">1626 </span>    <span class="subxComment">#       has-sib? = true</span>
+<span id="L1627" class="LineNr">1627 </span>    <span class="subxComment">#     else if (has-metadata?(word-slice, &quot;index&quot;)</span>
+<span id="L1628" class="LineNr">1628 </span>    <span class="subxComment">#       var index = parse-hex-int(next-token-from-slice(word-slice, &quot;/&quot;))</span>
+<span id="L1629" class="LineNr">1629 </span>    <span class="subxComment">#       has-sib? = true</span>
+<span id="L1630" class="LineNr">1630 </span>    <span class="subxComment">#     else if (has-metadata?(word-slice, &quot;scale&quot;)</span>
+<span id="L1631" class="LineNr">1631 </span>    <span class="subxComment">#       var scale = parse-hex-int(next-token-from-slice(word-slice, &quot;/&quot;))</span>
+<span id="L1632" class="LineNr">1632 </span>    <span class="subxComment">#       has-sib? = true</span>
+<span id="L1633" class="LineNr">1633 </span>    <span class="subxComment">#   if has-modrm?</span>
+<span id="L1634" class="LineNr">1634 </span>    <span class="subxComment">#     var modrm = mod &amp; 0b11</span>
+<span id="L1635" class="LineNr">1635 </span>    <span class="subxComment">#     modrm &lt;&lt;= 2</span>
+<span id="L1636" class="LineNr">1636 </span>    <span class="subxComment">#     modrm |= r32 &amp; 0b111</span>
+<span id="L1637" class="LineNr">1637 </span>    <span class="subxComment">#     modrm &lt;&lt;= 3</span>
+<span id="L1638" class="LineNr">1638 </span>    <span class="subxComment">#     modrm |= rm32 &amp; 0b111</span>
+<span id="L1639" class="LineNr">1639 </span>    <span class="subxComment">#     emit-hex(out, modrm, 1)</span>
+<span id="L1640" class="LineNr">1640 </span>    <span class="subxComment">#   if has-sib?</span>
+<span id="L1641" class="LineNr">1641 </span>    <span class="subxComment">#     var sib = scale &amp; 0b11</span>
+<span id="L1642" class="LineNr">1642 </span>    <span class="subxComment">#     sib &lt;&lt;= 2</span>
+<span id="L1643" class="LineNr">1643 </span>    <span class="subxComment">#     sib |= index &amp; 0b111</span>
+<span id="L1644" class="LineNr">1644 </span>    <span class="subxComment">#     sib &lt;&lt;= 3</span>
+<span id="L1645" class="LineNr">1645 </span>    <span class="subxComment">#     sib |= base &amp; 0b111</span>
+<span id="L1646" class="LineNr">1646 </span>    <span class="subxComment">#     emit-hex(out, sib, 1)</span>
+<span id="L1647" class="LineNr">1647 </span>    <span class="subxComment">#   # emit disp bytes</span>
+<span id="L1648" class="LineNr">1648 </span>    <span class="subxComment">#   rewind-stream(line)</span>
+<span id="L1649" class="LineNr">1649 </span>    <span class="subxComment">#   while true</span>
+<span id="L1650" class="LineNr">1650 </span>    <span class="subxComment">#     word-slice = next-word(line)</span>
+<span id="L1651" class="LineNr">1651 </span>    <span class="subxComment">#     if (empty(word-slice)) break</span>
+<span id="L1652" class="LineNr">1652 </span>    <span class="subxComment">#     if (slice-starts-with?(word-slice, &quot;#&quot;)) break</span>
+<span id="L1653" class="LineNr">1653 </span>    <span class="subxComment">#     if has-metadata?(word-slice, &quot;disp8&quot;)</span>
+<span id="L1654" class="LineNr">1654 </span>    <span class="subxComment">#       var disp = parse-hex-int(next-token-from-slice(word-slice, &quot;/&quot;))</span>
+<span id="L1655" class="LineNr">1655 </span>    <span class="subxComment">#       emit-hex(out, disp, 1)</span>
+<span id="L1656" class="LineNr">1656 </span>    <span class="subxComment">#       break</span>
+<span id="L1657" class="LineNr">1657 </span>    <span class="subxComment">#     else if has-metadata?(word-slice, &quot;disp16&quot;)</span>
+<span id="L1658" class="LineNr">1658 </span>    <span class="subxComment">#       var disp = parse-hex-int(next-token-from-slice(word-slice, &quot;/&quot;))</span>
+<span id="L1659" class="LineNr">1659 </span>    <span class="subxComment">#       emit-hex(out, disp, 2)</span>
+<span id="L1660" class="LineNr">1660 </span>    <span class="subxComment">#       break</span>
+<span id="L1661" class="LineNr">1661 </span>    <span class="subxComment">#     else if has-metadata?(word-slice, &quot;disp32&quot;)</span>
+<span id="L1662" class="LineNr">1662 </span>    <span class="subxComment">#       var disp = parse-hex-int(next-token-from-slice(word-slice, &quot;/&quot;))</span>
+<span id="L1663" class="LineNr">1663 </span>    <span class="subxComment">#       emit-hex(out, disp, 4)</span>
+<span id="L1664" class="LineNr">1664 </span>    <span class="subxComment">#       break</span>
+<span id="L1665" class="LineNr">1665 </span>    <span class="subxComment">#   # emit imm bytes</span>
+<span id="L1666" class="LineNr">1666 </span>    <span class="subxComment">#   rewind-stream(line)</span>
+<span id="L1667" class="LineNr">1667 </span>    <span class="subxComment">#   while true</span>
+<span id="L1668" class="LineNr">1668 </span>    <span class="subxComment">#     word-slice = next-word(line)</span>
+<span id="L1669" class="LineNr">1669 </span>    <span class="subxComment">#     if (slice-starts-with?(word-slice, &quot;#&quot;)) break</span>
+<span id="L1670" class="LineNr">1670 </span>    <span class="subxComment">#     if (empty(word-slice)) break</span>
+<span id="L1671" class="LineNr">1671 </span>    <span class="subxComment">#     if has-metadata?(word-slice, &quot;imm8&quot;)</span>
+<span id="L1672" class="LineNr">1672 </span>    <span class="subxComment">#       var imm = parse-hex-int(next-token-from-slice(word-slice, &quot;/&quot;))</span>
+<span id="L1673" class="LineNr">1673 </span>    <span class="subxComment">#       emit-hex(out, imm, 1)</span>
+<span id="L1674" class="LineNr">1674 </span>    <span class="subxComment">#       break</span>
+<span id="L1675" class="LineNr">1675 </span>    <span class="subxComment">#     if has-metadata?(word-slice, &quot;imm16&quot;)</span>
+<span id="L1676" class="LineNr">1676 </span>    <span class="subxComment">#       var imm = parse-hex-int(next-token-from-slice(word-slice, &quot;/&quot;))</span>
+<span id="L1677" class="LineNr">1677 </span>    <span class="subxComment">#       emit-hex(out, imm, 2)</span>
+<span id="L1678" class="LineNr">1678 </span>    <span class="subxComment">#       break</span>
+<span id="L1679" class="LineNr">1679 </span>    <span class="subxComment">#     else if has-metadata?(word-slice, &quot;imm32&quot;)</span>
+<span id="L1680" class="LineNr">1680 </span>    <span class="subxComment">#       var imm = parse-hex-int(next-token-from-slice(word-slice, &quot;/&quot;))</span>
+<span id="L1681" class="LineNr">1681 </span>    <span class="subxComment">#       emit-hex(out, imm, 4)</span>
+<span id="L1682" class="LineNr">1682 </span>    <span class="subxComment">#       break</span>
+<span id="L1683" class="LineNr">1683 </span>    <span class="subxComment">#</span>
+<span id="L1684" class="LineNr">1684 </span>    <span class="subxComment"># Exit blocks:</span>
+<span id="L1685" class="LineNr">1685 </span>    <span class="subxComment">#   pass-through:</span>
+<span id="L1686" class="LineNr">1686 </span>    <span class="subxComment">#     write-stream-buffered(out, line)</span>
+<span id="L1687" class="LineNr">1687 </span>    <span class="subxComment">#     return</span>
+<span id="L1688" class="LineNr">1688 </span>    <span class="subxComment">#</span>
+<span id="L1689" class="LineNr">1689 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L1690" class="LineNr">1690 </span>    55/push-EBP
+<span id="L1691" class="LineNr">1691 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L1692" class="LineNr">1692 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L1693" class="LineNr">1693 </span>    51/push-ECX
+<span id="L1694" class="LineNr">1694 </span>    <span class="subxComment"># var word-slice/ECX = {0, 0}</span>
+<span id="L1695" class="LineNr">1695 </span>    68/push  0/imm32/end
+<span id="L1696" class="LineNr">1696 </span>    68/push  0/imm32/start
+<span id="L1697" class="LineNr">1697 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L1698" class="LineNr">1698 </span>    <span class="subxComment"># next-word(line, word-slice)</span>
+<span id="L1699" class="LineNr">1699 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1700" class="LineNr">1700 </span>    51/push-ECX
+<span id="L1701" class="LineNr">1701 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L1702" class="LineNr">1702 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1703" class="LineNr">1703 </span>    e8/call  <a href='pack.subx.html#L1863'>next-word</a>/disp32
+<span id="L1704" class="LineNr">1704 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1705" class="LineNr">1705 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1706" class="LineNr">1706 </span><span class="Constant">$convert-instruction:pass-line-through</span>:
+<span id="L1707" class="LineNr">1707 </span>    <span class="subxComment"># write-stream-buffered(out, line)</span>
+<span id="L1708" class="LineNr">1708 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1709" class="LineNr">1709 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L1710" class="LineNr">1710 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L1711" class="LineNr">1711 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1712" class="LineNr">1712 </span>    e8/call  <a href='../072slice.subx.html#L803'>write-stream-buffered</a>/disp32
+<span id="L1713" class="LineNr">1713 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1714" class="LineNr">1714 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1715" class="LineNr">1715 </span><span class="Constant">$convert-instruction:end</span>:
+<span id="L1716" class="LineNr">1716 </span>    <span class="subxS1Comment"># . reclaim locals</span>
+<span id="L1717" class="LineNr">1717 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1718" class="LineNr">1718 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L1719" class="LineNr">1719 </span>    59/pop-to-ECX
+<span id="L1720" class="LineNr">1720 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L1721" class="LineNr">1721 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L1722" class="LineNr">1722 </span>    5d/pop-to-EBP
+<span id="L1723" class="LineNr">1723 </span>    c3/return
+<span id="L1724" class="LineNr">1724 </span>
+<span id="L1725" class="LineNr">1725 </span><span class="subxTest">test-convert-instruction-passes-comments-through</span>:
+<span id="L1726" class="LineNr">1726 </span>    <span class="subxComment"># if a line starts with '#', pass it along unchanged</span>
+<span id="L1727" class="LineNr">1727 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L1728" class="LineNr">1728 </span>    55/push-EBP
+<span id="L1729" class="LineNr">1729 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L1730" class="LineNr">1730 </span>    <span class="subxComment"># setup</span>
+<span id="L1731" class="LineNr">1731 </span>    <span class="subxS1Comment"># . clear-stream(_test-input-stream)</span>
+<span id="L1732" class="LineNr">1732 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1733" class="LineNr">1733 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L1734" class="LineNr">1734 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1735" class="LineNr">1735 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1736" class="LineNr">1736 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1737" class="LineNr">1737 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1738" class="LineNr">1738 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-stream)</span>
+<span id="L1739" class="LineNr">1739 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1740" class="LineNr">1740 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L1741" class="LineNr">1741 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1742" class="LineNr">1742 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1743" class="LineNr">1743 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1744" class="LineNr">1744 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1745" class="LineNr">1745 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-buffered-file+4)</span>
+<span id="L1746" class="LineNr">1746 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1747" class="LineNr">1747 </span>    b8/copy-to-EAX  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L1748" class="LineNr">1748 </span>    05/add-to-EAX  4/imm32
+<span id="L1749" class="LineNr">1749 </span>    50/push-EAX
+<span id="L1750" class="LineNr">1750 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1751" class="LineNr">1751 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1752" class="LineNr">1752 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1753" class="LineNr">1753 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1754" class="LineNr">1754 </span>    <span class="subxComment"># initialize input</span>
+<span id="L1755" class="LineNr">1755 </span>    <span class="subxS1Comment"># . write(_test-input-stream, &quot;# abcd&quot;)</span>
+<span id="L1756" class="LineNr">1756 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1757" class="LineNr">1757 </span>    68/push  <span class="Constant">&quot;# abcd&quot;</span>/imm32
+<span id="L1758" class="LineNr">1758 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L1759" class="LineNr">1759 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1760" class="LineNr">1760 </span>    e8/call  <a href='../057write.subx.html#L24'>write</a>/disp32
+<span id="L1761" class="LineNr">1761 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1762" class="LineNr">1762 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1763" class="LineNr">1763 </span>    <span class="subxComment"># convert-instruction(_test-input-stream, _test-output-buffered-file)</span>
+<span id="L1764" class="LineNr">1764 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1765" class="LineNr">1765 </span>    68/push  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L1766" class="LineNr">1766 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L1767" class="LineNr">1767 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1768" class="LineNr">1768 </span>    e8/call  <a href='pack.subx.html#L1578'>convert-instruction</a>/disp32
+<span id="L1769" class="LineNr">1769 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1770" class="LineNr">1770 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1771" class="LineNr">1771 </span>    <span class="subxComment"># check that the line just passed through</span>
+<span id="L1772" class="LineNr">1772 </span>    <span class="subxS1Comment"># . flush(_test-output-buffered-file)</span>
+<span id="L1773" class="LineNr">1773 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1774" class="LineNr">1774 </span>    68/push  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L1775" class="LineNr">1775 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1776" class="LineNr">1776 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
+<span id="L1777" class="LineNr">1777 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1778" class="LineNr">1778 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1779" class="LineNr">1779 </span>    <span class="subxS1Comment"># . check-stream-equal(_test-output-stream, &quot;# abcd&quot;, msg)</span>
+<span id="L1780" class="LineNr">1780 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1781" class="LineNr">1781 </span>    68/push  <span class="Constant">&quot;F - test-convert-instruction-passes-comments-through&quot;</span>/imm32
+<span id="L1782" class="LineNr">1782 </span>    68/push  <span class="Constant">&quot;# abcd&quot;</span>/imm32
+<span id="L1783" class="LineNr">1783 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L1784" class="LineNr">1784 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1785" class="LineNr">1785 </span>    e8/call  <a href='../058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
+<span id="L1786" class="LineNr">1786 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1787" class="LineNr">1787 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L1788" class="LineNr">1788 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L1789" class="LineNr">1789 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L1790" class="LineNr">1790 </span>    5d/pop-to-EBP
+<span id="L1791" class="LineNr">1791 </span>    c3/return
+<span id="L1792" class="LineNr">1792 </span>
+<span id="L1793" class="LineNr">1793 </span><span class="subxTest">test-convert-instruction-passes-labels-through</span>:
+<span id="L1794" class="LineNr">1794 </span>    <span class="subxComment"># if the first word ends with ':', pass along the entire line unchanged</span>
+<span id="L1795" class="LineNr">1795 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L1796" class="LineNr">1796 </span>    55/push-EBP
+<span id="L1797" class="LineNr">1797 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L1798" class="LineNr">1798 </span>    <span class="subxComment"># setup</span>
+<span id="L1799" class="LineNr">1799 </span>    <span class="subxS1Comment"># . clear-stream(_test-input-stream)</span>
+<span id="L1800" class="LineNr">1800 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1801" class="LineNr">1801 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L1802" class="LineNr">1802 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1803" class="LineNr">1803 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1804" class="LineNr">1804 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1805" class="LineNr">1805 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1806" class="LineNr">1806 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-stream)</span>
+<span id="L1807" class="LineNr">1807 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1808" class="LineNr">1808 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L1809" class="LineNr">1809 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1810" class="LineNr">1810 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1811" class="LineNr">1811 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1812" class="LineNr">1812 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1813" class="LineNr">1813 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-buffered-file+4)</span>
+<span id="L1814" class="LineNr">1814 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1815" class="LineNr">1815 </span>    b8/copy-to-EAX  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L1816" class="LineNr">1816 </span>    05/add-to-EAX  4/imm32
+<span id="L1817" class="LineNr">1817 </span>    50/push-EAX
+<span id="L1818" class="LineNr">1818 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1819" class="LineNr">1819 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1820" class="LineNr">1820 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1821" class="LineNr">1821 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1822" class="LineNr">1822 </span>    <span class="subxComment"># initialize input</span>
+<span id="L1823" class="LineNr">1823 </span>    <span class="subxS1Comment"># . write(_test-input-stream, &quot;ab: # cd&quot;)</span>
+<span id="L1824" class="LineNr">1824 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1825" class="LineNr">1825 </span>    68/push  <span class="Constant">&quot;ab: # cd&quot;</span>/imm32
+<span id="L1826" class="LineNr">1826 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L1827" class="LineNr">1827 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1828" class="LineNr">1828 </span>    e8/call  <a href='../057write.subx.html#L24'>write</a>/disp32
+<span id="L1829" class="LineNr">1829 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1830" class="LineNr">1830 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1831" class="LineNr">1831 </span>    <span class="subxComment"># convert-instruction(_test-input-stream, _test-output-buffered-file)</span>
+<span id="L1832" class="LineNr">1832 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1833" class="LineNr">1833 </span>    68/push  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L1834" class="LineNr">1834 </span>    68/push  <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L1835" class="LineNr">1835 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1836" class="LineNr">1836 </span>    e8/call  <a href='pack.subx.html#L1578'>convert-instruction</a>/disp32
+<span id="L1837" class="LineNr">1837 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1838" class="LineNr">1838 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1839" class="LineNr">1839 </span>    <span class="subxComment"># check that the line just passed through</span>
+<span id="L1840" class="LineNr">1840 </span>    <span class="subxS1Comment"># . flush(_test-output-buffered-file)</span>
+<span id="L1841" class="LineNr">1841 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1842" class="LineNr">1842 </span>    68/push  <a href='pack.subx.html#L3349'>_test-output-buffered-file</a>/imm32
+<span id="L1843" class="LineNr">1843 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1844" class="LineNr">1844 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
+<span id="L1845" class="LineNr">1845 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1846" class="LineNr">1846 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1847" class="LineNr">1847 </span>    <span class="subxS1Comment"># . check-stream-equal(_test-output-stream, &quot;ab: # cd&quot;, msg)</span>
+<span id="L1848" class="LineNr">1848 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1849" class="LineNr">1849 </span>    68/push  <span class="Constant">&quot;F - test-convert-instruction-passes-labels-through&quot;</span>/imm32
+<span id="L1850" class="LineNr">1850 </span>    68/push  <span class="Constant">&quot;ab: # cd&quot;</span>/imm32
+<span id="L1851" class="LineNr">1851 </span>    68/push  <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L1852" class="LineNr">1852 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1853" class="LineNr">1853 </span>    e8/call  <a href='../058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
+<span id="L1854" class="LineNr">1854 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1855" class="LineNr">1855 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L1856" class="LineNr">1856 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L1857" class="LineNr">1857 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L1858" class="LineNr">1858 </span>    5d/pop-to-EBP
+<span id="L1859" class="LineNr">1859 </span>    c3/return
+<span id="L1860" class="LineNr">1860 </span>
+<span id="L1861" class="LineNr">1861 </span><span class="subxComment"># (re)compute the bounds of the next word in the line</span>
+<span id="L1862" class="LineNr">1862 </span><span class="subxComment"># return empty string on reaching end of file</span>
+<span id="L1863" class="LineNr">1863 </span><span class="subxFunction">next-word</span>:  <span class="subxComment"># line : (address stream byte), out : (address slice)</span>
+<span id="L1864" class="LineNr">1864 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L1865" class="LineNr">1865 </span>    55/push-EBP
+<span id="L1866" class="LineNr">1866 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L1867" class="LineNr">1867 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L1868" class="LineNr">1868 </span>    50/push-EAX
+<span id="L1869" class="LineNr">1869 </span>    51/push-ECX
+<span id="L1870" class="LineNr">1870 </span>    56/push-ESI
+<span id="L1871" class="LineNr">1871 </span>    57/push-EDI
+<span id="L1872" class="LineNr">1872 </span>    <span class="subxComment"># ESI = line</span>
+<span id="L1873" class="LineNr">1873 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
+<span id="L1874" class="LineNr">1874 </span>    <span class="subxComment"># EDI = out</span>
+<span id="L1875" class="LineNr">1875 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          7/r32/EDI   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDI</span>
+<span id="L1876" class="LineNr">1876 </span>    <span class="subxComment"># skip-chars-matching(line, ' ')</span>
+<span id="L1877" class="LineNr">1877 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1878" class="LineNr">1878 </span>    68/push  0x20/imm32/space
+<span id="L1879" class="LineNr">1879 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L1880" class="LineNr">1880 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1881" class="LineNr">1881 </span>    e8/call  <a href='../073next-token.subx.html#L346'>skip-chars-matching</a>/disp32
+<span id="L1882" class="LineNr">1882 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1883" class="LineNr">1883 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1884" class="LineNr">1884 </span><span class="Constant">$next-word:check0</span>:
+<span id="L1885" class="LineNr">1885 </span>    <span class="subxComment"># if (line-&gt;read &gt;= line-&gt;write) clear out and return</span>
+<span id="L1886" class="LineNr">1886 </span>    <span class="subxS1Comment"># . EAX = line-&gt;read</span>
+<span id="L1887" class="LineNr">1887 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESI+4) to EAX</span>
+<span id="L1888" class="LineNr">1888 </span>    <span class="subxS1Comment"># . if (EAX &lt; line-&gt;write) goto next check</span>
+<span id="L1889" class="LineNr">1889 </span>    3b/compare                      0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX with *ESI</span>
+<span id="L1890" class="LineNr">1890 </span>    7c/jump-if-lesser  $next-word:check1/disp8
+<span id="L1891" class="LineNr">1891 </span>    <span class="subxS1Comment"># . return out = {0, 0}</span>
+<span id="L1892" class="LineNr">1892 </span>    c7          0/subop/copy        0/mod/direct    7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># copy to *EDI</span>
+<span id="L1893" class="LineNr">1893 </span>    c7          0/subop/copy        1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8         0/imm32           <span class="subxComment"># copy to *(EDI+4)</span>
+<span id="L1894" class="LineNr">1894 </span>    eb/jump  $next-word:end/disp8
+<span id="L1895" class="LineNr">1895 </span><span class="Constant">$next-word:check1</span>:
+<span id="L1896" class="LineNr">1896 </span>    <span class="subxComment"># out-&gt;start = &amp;line-&gt;data[line-&gt;read]</span>
+<span id="L1897" class="LineNr">1897 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESI+4) to ECX</span>
+<span id="L1898" class="LineNr">1898 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  1/index/ECX  <span class="Normal"> . </span>          0/r32/EAX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy ESI+ECX+12 to EAX</span>
+<span id="L1899" class="LineNr">1899 </span>    89/copy                         0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to *EDI</span>
+<span id="L1900" class="LineNr">1900 </span>    <span class="subxComment"># if (line-&gt;data[line-&gt;read] == '#') out-&gt;end = &amp;line-&gt;data[line-&gt;write]), skip rest of stream and return</span>
+<span id="L1901" class="LineNr">1901 </span>    <span class="subxS1Comment"># . EAX = line-&gt;data[line-&gt;read]</span>
+<span id="L1902" class="LineNr">1902 </span>    31/xor                          3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EAX</span>
+<span id="L1903" class="LineNr">1903 </span>    8a/copy-byte                    1/mod/*+disp8   4/rm32/sib    6/base/ESI  1/index/ECX  <span class="Normal"> . </span>          0/r32/AL    0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *(ESI+ECX+12) to AL</span>
+<span id="L1904" class="LineNr">1904 </span>    <span class="subxS1Comment"># . compare</span>
+<span id="L1905" class="LineNr">1905 </span>    3d/compare-EAX-with  0x23/imm32/pound
+<span id="L1906" class="LineNr">1906 </span>    75/jump-if-not-equal  $next-word:not-comment/disp8
+<span id="L1907" class="LineNr">1907 </span>    <span class="subxS1Comment"># . out-&gt;end = &amp;line-&gt;data[line-&gt;write]</span>
+<span id="L1908" class="LineNr">1908 </span>    8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ESI to EAX</span>
+<span id="L1909" class="LineNr">1909 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  0/index/EAX  <span class="Normal"> . </span>          0/r32/EAX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy ESI+EAX+12 to EAX</span>
+<span id="L1910" class="LineNr">1910 </span>    89/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to *(EDI+4)</span>
+<span id="L1911" class="LineNr">1911 </span>    <span class="subxS1Comment"># . line-&gt;read = line-&gt;write</span>
+<span id="L1912" class="LineNr">1912 </span>    89/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to *(ESI+4)</span>
+<span id="L1913" class="LineNr">1913 </span>    <span class="subxS1Comment"># . return</span>
+<span id="L1914" class="LineNr">1914 </span>    eb/jump  $next-word:end/disp8
+<span id="L1915" class="LineNr">1915 </span><span class="Constant">$next-word:not-comment</span>:
+<span id="L1916" class="LineNr">1916 </span>    <span class="subxComment"># otherwise skip-chars-not-matching-whitespace(line)</span>
+<span id="L1917" class="LineNr">1917 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1918" class="LineNr">1918 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L1919" class="LineNr">1919 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1920" class="LineNr">1920 </span>    e8/call  <a href='../073next-token.subx.html#L632'>skip-chars-not-matching-whitespace</a>/disp32
+<span id="L1921" class="LineNr">1921 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1922" class="LineNr">1922 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1923" class="LineNr">1923 </span>    <span class="subxComment"># out-&gt;end = &amp;line-&gt;data[line-&gt;read]</span>
+<span id="L1924" class="LineNr">1924 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESI+4) to ECX</span>
+<span id="L1925" class="LineNr">1925 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  1/index/ECX  <span class="Normal"> . </span>          0/r32/EAX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy ESI+ECX+12 to EAX</span>
+<span id="L1926" class="LineNr">1926 </span>    89/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to *(EDI+4)</span>
+<span id="L1927" class="LineNr">1927 </span><span class="Constant">$next-word:end</span>:
+<span id="L1928" class="LineNr">1928 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L1929" class="LineNr">1929 </span>    5f/pop-to-EDI
+<span id="L1930" class="LineNr">1930 </span>    5e/pop-to-ESI
+<span id="L1931" class="LineNr">1931 </span>    59/pop-to-ECX
+<span id="L1932" class="LineNr">1932 </span>    58/pop-to-EAX
+<span id="L1933" class="LineNr">1933 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L1934" class="LineNr">1934 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L1935" class="LineNr">1935 </span>    5d/pop-to-EBP
+<span id="L1936" class="LineNr">1936 </span>    c3/return
+<span id="L1937" class="LineNr">1937 </span>
+<span id="L1938" class="LineNr">1938 </span><span class="subxTest">test-next-word</span>:
+<span id="L1939" class="LineNr">1939 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L1940" class="LineNr">1940 </span>    55/push-EBP
+<span id="L1941" class="LineNr">1941 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L1942" class="LineNr">1942 </span>    <span class="subxComment"># setup</span>
+<span id="L1943" class="LineNr">1943 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L1944" class="LineNr">1944 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1945" class="LineNr">1945 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L1946" class="LineNr">1946 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1947" class="LineNr">1947 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L1948" class="LineNr">1948 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1949" class="LineNr">1949 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1950" class="LineNr">1950 </span>    <span class="subxComment"># var slice/ECX = {0, 0}</span>
+<span id="L1951" class="LineNr">1951 </span>    68/push  0/imm32/end
+<span id="L1952" class="LineNr">1952 </span>    68/push  0/imm32/start
+<span id="L1953" class="LineNr">1953 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L1954" class="LineNr">1954 </span>    <span class="subxComment"># write(_test-stream, &quot;  ab&quot;)</span>
+<span id="L1955" class="LineNr">1955 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1956" class="LineNr">1956 </span>    68/push  <span class="Constant">&quot;  ab&quot;</span>/imm32
+<span id="L1957" class="LineNr">1957 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L1958" class="LineNr">1958 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1959" class="LineNr">1959 </span>    e8/call  <a href='../057write.subx.html#L24'>write</a>/disp32
+<span id="L1960" class="LineNr">1960 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1961" class="LineNr">1961 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1962" class="LineNr">1962 </span>    <span class="subxComment"># next-word(_test-stream, slice)</span>
+<span id="L1963" class="LineNr">1963 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1964" class="LineNr">1964 </span>    51/push-ECX
+<span id="L1965" class="LineNr">1965 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L1966" class="LineNr">1966 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1967" class="LineNr">1967 </span>    e8/call  <a href='pack.subx.html#L1863'>next-word</a>/disp32
+<span id="L1968" class="LineNr">1968 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1969" class="LineNr">1969 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1970" class="LineNr">1970 </span>    <span class="subxComment"># check-ints-equal(slice-&gt;start - _test-stream-&gt;data, 2, msg)</span>
+<span id="L1971" class="LineNr">1971 </span>    <span class="subxS1Comment"># . check-ints-equal(slice-&gt;start - _test-stream, 14, msg)</span>
+<span id="L1972" class="LineNr">1972 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1973" class="LineNr">1973 </span>    68/push  <span class="Constant">&quot;F - <a href='pack.subx.html#L1938'>test-next-word</a>: start&quot;</span>/imm32
+<span id="L1974" class="LineNr">1974 </span>    68/push  0xe/imm32
+<span id="L1975" class="LineNr">1975 </span>    <span class="subxS2Comment"># . . push slice-&gt;start - _test-stream</span>
+<span id="L1976" class="LineNr">1976 </span>    8b/copy                         0/mod/indirect  1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ECX to EAX</span>
+<span id="L1977" class="LineNr">1977 </span>    81          5/subop/subtract    3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              <a href='../057write.subx.html#L148'>_test-stream</a>/imm32 <span class="subxComment"># subtract from EAX</span>
+<span id="L1978" class="LineNr">1978 </span>    50/push-EAX
+<span id="L1979" class="LineNr">1979 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1980" class="LineNr">1980 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L1981" class="LineNr">1981 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1982" class="LineNr">1982 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L1983" class="LineNr">1983 </span>    <span class="subxComment"># check-ints-equal(slice-&gt;end - _test-stream-&gt;data, 4, msg)</span>
+<span id="L1984" class="LineNr">1984 </span>    <span class="subxS1Comment"># . check-ints-equal(slice-&gt;end - _test-stream, 16, msg)</span>
+<span id="L1985" class="LineNr">1985 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L1986" class="LineNr">1986 </span>    68/push  <span class="Constant">&quot;F - <a href='pack.subx.html#L1938'>test-next-word</a>: end&quot;</span>/imm32
+<span id="L1987" class="LineNr">1987 </span>    68/push  0x10/imm32
+<span id="L1988" class="LineNr">1988 </span>    <span class="subxS2Comment"># . . push slice-&gt;end - _test-stream</span>
+<span id="L1989" class="LineNr">1989 </span>    8b/copy                         1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ECX+4) to EAX</span>
+<span id="L1990" class="LineNr">1990 </span>    81          5/subop/subtract    3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              <a href='../057write.subx.html#L148'>_test-stream</a>/imm32 <span class="subxComment"># subtract from EAX</span>
+<span id="L1991" class="LineNr">1991 </span>    50/push-EAX
+<span id="L1992" class="LineNr">1992 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L1993" class="LineNr">1993 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L1994" class="LineNr">1994 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L1995" class="LineNr">1995 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L1996" class="LineNr">1996 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L1997" class="LineNr">1997 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L1998" class="LineNr">1998 </span>    5d/pop-to-EBP
+<span id="L1999" class="LineNr">1999 </span>    c3/return
+<span id="L2000" class="LineNr">2000 </span>
+<span id="L2001" class="LineNr">2001 </span><span class="subxTest">test-next-word-returns-whole-comment</span>:
+<span id="L2002" class="LineNr">2002 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L2003" class="LineNr">2003 </span>    55/push-EBP
+<span id="L2004" class="LineNr">2004 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L2005" class="LineNr">2005 </span>    <span class="subxComment"># setup</span>
+<span id="L2006" class="LineNr">2006 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L2007" class="LineNr">2007 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2008" class="LineNr">2008 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L2009" class="LineNr">2009 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2010" class="LineNr">2010 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L2011" class="LineNr">2011 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2012" class="LineNr">2012 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2013" class="LineNr">2013 </span>    <span class="subxComment"># var slice/ECX = {0, 0}</span>
+<span id="L2014" class="LineNr">2014 </span>    68/push  0/imm32/end
+<span id="L2015" class="LineNr">2015 </span>    68/push  0/imm32/start
+<span id="L2016" class="LineNr">2016 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L2017" class="LineNr">2017 </span>    <span class="subxComment"># write(_test-stream, &quot;  # a&quot;)</span>
+<span id="L2018" class="LineNr">2018 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2019" class="LineNr">2019 </span>    68/push  <span class="Constant">&quot;  # a&quot;</span>/imm32
+<span id="L2020" class="LineNr">2020 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L2021" class="LineNr">2021 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2022" class="LineNr">2022 </span>    e8/call  <a href='../057write.subx.html#L24'>write</a>/disp32
+<span id="L2023" class="LineNr">2023 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2024" class="LineNr">2024 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2025" class="LineNr">2025 </span>    <span class="subxComment"># next-word(_test-stream, slice)</span>
+<span id="L2026" class="LineNr">2026 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2027" class="LineNr">2027 </span>    51/push-ECX
+<span id="L2028" class="LineNr">2028 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L2029" class="LineNr">2029 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2030" class="LineNr">2030 </span>    e8/call  <a href='pack.subx.html#L1863'>next-word</a>/disp32
+<span id="L2031" class="LineNr">2031 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2032" class="LineNr">2032 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2033" class="LineNr">2033 </span>    <span class="subxComment"># check-ints-equal(slice-&gt;start - _test-stream-&gt;data, 2, msg)</span>
+<span id="L2034" class="LineNr">2034 </span>    <span class="subxS1Comment"># . check-ints-equal(slice-&gt;start - _test-stream, 14, msg)</span>
+<span id="L2035" class="LineNr">2035 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2036" class="LineNr">2036 </span>    68/push  <span class="Constant">&quot;F - <a href='pack.subx.html#L2001'>test-next-word-returns-whole-comment</a>: start&quot;</span>/imm32
+<span id="L2037" class="LineNr">2037 </span>    68/push  0xe/imm32
+<span id="L2038" class="LineNr">2038 </span>    <span class="subxS2Comment"># . . push slice-&gt;start - _test-stream</span>
+<span id="L2039" class="LineNr">2039 </span>    8b/copy                         0/mod/indirect  1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ECX to EAX</span>
+<span id="L2040" class="LineNr">2040 </span>    81          5/subop/subtract    3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              <a href='../057write.subx.html#L148'>_test-stream</a>/imm32 <span class="subxComment"># subtract from EAX</span>
+<span id="L2041" class="LineNr">2041 </span>    50/push-EAX
+<span id="L2042" class="LineNr">2042 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2043" class="LineNr">2043 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L2044" class="LineNr">2044 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2045" class="LineNr">2045 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2046" class="LineNr">2046 </span>    <span class="subxComment"># check-ints-equal(slice-&gt;end - _test-stream-&gt;data, 5, msg)</span>
+<span id="L2047" class="LineNr">2047 </span>    <span class="subxS1Comment"># . check-ints-equal(slice-&gt;end - _test-stream, 17, msg)</span>
+<span id="L2048" class="LineNr">2048 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2049" class="LineNr">2049 </span>    68/push  <span class="Constant">&quot;F - <a href='pack.subx.html#L2001'>test-next-word-returns-whole-comment</a>: end&quot;</span>/imm32
+<span id="L2050" class="LineNr">2050 </span>    68/push  0x11/imm32
+<span id="L2051" class="LineNr">2051 </span>    <span class="subxS2Comment"># . . push slice-&gt;end - _test-stream</span>
+<span id="L2052" class="LineNr">2052 </span>    8b/copy                         1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ECX+4) to EAX</span>
+<span id="L2053" class="LineNr">2053 </span>    81          5/subop/subtract    3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              <a href='../057write.subx.html#L148'>_test-stream</a>/imm32 <span class="subxComment"># subtract from EAX</span>
+<span id="L2054" class="LineNr">2054 </span>    50/push-EAX
+<span id="L2055" class="LineNr">2055 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2056" class="LineNr">2056 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L2057" class="LineNr">2057 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2058" class="LineNr">2058 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2059" class="LineNr">2059 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L2060" class="LineNr">2060 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L2061" class="LineNr">2061 </span>    5d/pop-to-EBP
+<span id="L2062" class="LineNr">2062 </span>    c3/return
+<span id="L2063" class="LineNr">2063 </span>
+<span id="L2064" class="LineNr">2064 </span><span class="subxTest">test-next-word-returns-empty-string-on-eof</span>:
+<span id="L2065" class="LineNr">2065 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L2066" class="LineNr">2066 </span>    55/push-EBP
+<span id="L2067" class="LineNr">2067 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L2068" class="LineNr">2068 </span>    <span class="subxComment"># setup</span>
+<span id="L2069" class="LineNr">2069 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L2070" class="LineNr">2070 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2071" class="LineNr">2071 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L2072" class="LineNr">2072 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2073" class="LineNr">2073 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L2074" class="LineNr">2074 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2075" class="LineNr">2075 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2076" class="LineNr">2076 </span>    <span class="subxComment"># var slice/ECX = {0, 0}</span>
+<span id="L2077" class="LineNr">2077 </span>    68/push  0/imm32/end
+<span id="L2078" class="LineNr">2078 </span>    68/push  0/imm32/start
+<span id="L2079" class="LineNr">2079 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L2080" class="LineNr">2080 </span>    <span class="subxComment"># write nothing to _test-stream</span>
+<span id="L2081" class="LineNr">2081 </span>    <span class="subxComment"># next-word(_test-stream, slice)</span>
+<span id="L2082" class="LineNr">2082 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2083" class="LineNr">2083 </span>    51/push-ECX
+<span id="L2084" class="LineNr">2084 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L2085" class="LineNr">2085 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2086" class="LineNr">2086 </span>    e8/call  <a href='pack.subx.html#L1863'>next-word</a>/disp32
+<span id="L2087" class="LineNr">2087 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2088" class="LineNr">2088 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2089" class="LineNr">2089 </span>    <span class="subxComment"># check-ints-equal(slice-&gt;end - slice-&gt;start, 0, msg)</span>
+<span id="L2090" class="LineNr">2090 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2091" class="LineNr">2091 </span>    68/push  <span class="Constant">&quot;F - test-next-word-returns-empty-string-on-eof&quot;</span>/imm32
+<span id="L2092" class="LineNr">2092 </span>    68/push  0/imm32
+<span id="L2093" class="LineNr">2093 </span>    <span class="subxS2Comment"># . . push slice-&gt;end - slice-&gt;start</span>
+<span id="L2094" class="LineNr">2094 </span>    8b/copy                         1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ECX+4) to EAX</span>
+<span id="L2095" class="LineNr">2095 </span>    2b/subtract                     0/mod/indirect  1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># subtract *ECX from EAX</span>
+<span id="L2096" class="LineNr">2096 </span>    50/push-EAX
+<span id="L2097" class="LineNr">2097 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2098" class="LineNr">2098 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L2099" class="LineNr">2099 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2100" class="LineNr">2100 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2101" class="LineNr">2101 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L2102" class="LineNr">2102 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L2103" class="LineNr">2103 </span>    5d/pop-to-EBP
+<span id="L2104" class="LineNr">2104 </span>    c3/return
+<span id="L2105" class="LineNr">2105 </span>
+<span id="L2106" class="LineNr">2106 </span><span class="subxFunction">has-metadata?</span>:  <span class="subxComment"># word : (address slice), s : (address string) -&gt; EAX : boolean</span>
+<span id="L2107" class="LineNr">2107 </span>    <span class="subxComment"># pseudocode:</span>
+<span id="L2108" class="LineNr">2108 </span>    <span class="subxComment">#   var twig : &amp;slice = next-token-from-slice(word-&gt;start, word-&gt;end, '/')  # skip name</span>
+<span id="L2109" class="LineNr">2109 </span>    <span class="subxComment">#   curr = twig-&gt;end</span>
+<span id="L2110" class="LineNr">2110 </span>    <span class="subxComment">#   while true</span>
+<span id="L2111" class="LineNr">2111 </span>    <span class="subxComment">#     twig = next-token-from-slice(curr, word-&gt;end, '/')</span>
+<span id="L2112" class="LineNr">2112 </span>    <span class="subxComment">#     if (twig.empty()) break</span>
+<span id="L2113" class="LineNr">2113 </span>    <span class="subxComment">#     if (slice-equal?(twig, s)) return true</span>
+<span id="L2114" class="LineNr">2114 </span>    <span class="subxComment">#     curr = twig-&gt;end</span>
+<span id="L2115" class="LineNr">2115 </span>    <span class="subxComment">#   return false</span>
+<span id="L2116" class="LineNr">2116 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L2117" class="LineNr">2117 </span>    55/push-EBP
+<span id="L2118" class="LineNr">2118 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L2119" class="LineNr">2119 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L2120" class="LineNr">2120 </span>    51/push-ECX
+<span id="L2121" class="LineNr">2121 </span>    52/push-EDX
+<span id="L2122" class="LineNr">2122 </span>    56/push-ESI
+<span id="L2123" class="LineNr">2123 </span>    57/push-EDI
+<span id="L2124" class="LineNr">2124 </span>    <span class="subxComment"># ESI = word</span>
+<span id="L2125" class="LineNr">2125 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
+<span id="L2126" class="LineNr">2126 </span>    <span class="subxComment"># EDX = word-&gt;end</span>
+<span id="L2127" class="LineNr">2127 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESI+4) to EDX</span>
+<span id="L2128" class="LineNr">2128 </span>    <span class="subxComment"># var twig/EDI : (address slice) = {0, 0}</span>
+<span id="L2129" class="LineNr">2129 </span>    68/push  0/imm32/end
+<span id="L2130" class="LineNr">2130 </span>    68/push  0/imm32/start
+<span id="L2131" class="LineNr">2131 </span>    89/copy                         3/mod/direct    7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EDI</span>
+<span id="L2132" class="LineNr">2132 </span>    <span class="subxComment"># next-token-from-slice(word-&gt;start, word-&gt;end, '/', twig)</span>
+<span id="L2133" class="LineNr">2133 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2134" class="LineNr">2134 </span>    57/push-EDI
+<span id="L2135" class="LineNr">2135 </span>    68/push  0x2f/imm32/slash
+<span id="L2136" class="LineNr">2136 </span>    52/push-EDX
+<span id="L2137" class="LineNr">2137 </span>    ff          6/subop/push        0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># push *ESI</span>
+<span id="L2138" class="LineNr">2138 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2139" class="LineNr">2139 </span>    e8/call  <a href='../073next-token.subx.html#L168'>next-token-from-slice</a>/disp32
+<span id="L2140" class="LineNr">2140 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2141" class="LineNr">2141 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L2142" class="LineNr">2142 </span>    <span class="subxComment"># curr/ECX = twig-&gt;end</span>
+<span id="L2143" class="LineNr">2143 </span>    8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EDI+4) to ECX</span>
+<span id="L2144" class="LineNr">2144 </span><span class="Constant">$has-metadata?:loop</span>:
+<span id="L2145" class="LineNr">2145 </span>    <span class="subxComment"># next-token-from-slice(curr, word-&gt;end, '/', twig)</span>
+<span id="L2146" class="LineNr">2146 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2147" class="LineNr">2147 </span>    57/push-EDI
+<span id="L2148" class="LineNr">2148 </span>    68/push  0x2f/imm32/slash
+<span id="L2149" class="LineNr">2149 </span>    52/push-EDX
+<span id="L2150" class="LineNr">2150 </span>    51/push-ECX
+<span id="L2151" class="LineNr">2151 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2152" class="LineNr">2152 </span>    e8/call  <a href='../073next-token.subx.html#L168'>next-token-from-slice</a>/disp32
+<span id="L2153" class="LineNr">2153 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2154" class="LineNr">2154 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L2155" class="LineNr">2155 </span>    <span class="subxComment"># if (slice-empty?(twig)) return false</span>
+<span id="L2156" class="LineNr">2156 </span>    <span class="subxS1Comment"># . EAX = slice-empty?(twig)</span>
+<span id="L2157" class="LineNr">2157 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2158" class="LineNr">2158 </span>    57/push-EDI
+<span id="L2159" class="LineNr">2159 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2160" class="LineNr">2160 </span>    e8/call  <a href='../072slice.subx.html#L17'>slice-empty?</a>/disp32
+<span id="L2161" class="LineNr">2161 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2162" class="LineNr">2162 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2163" class="LineNr">2163 </span>    <span class="subxS1Comment"># . if (EAX != 0) return false</span>
+<span id="L2164" class="LineNr">2164 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># compare EAX</span>
+<span id="L2165" class="LineNr">2165 </span>    75/jump-if-not-equal  $has-metadata?:false/disp8
+<span id="L2166" class="LineNr">2166 </span>    <span class="subxComment"># if (slice-equal?(twig, s)) return true</span>
+<span id="L2167" class="LineNr">2167 </span>    <span class="subxS1Comment"># . EAX = slice-equal?(twig, s)</span>
+<span id="L2168" class="LineNr">2168 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2169" class="LineNr">2169 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L2170" class="LineNr">2170 </span>    57/push-EDI
+<span id="L2171" class="LineNr">2171 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2172" class="LineNr">2172 </span>    e8/call  <a href='../072slice.subx.html#L99'>slice-equal?</a>/disp32
+<span id="L2173" class="LineNr">2173 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2174" class="LineNr">2174 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2175" class="LineNr">2175 </span>    <span class="subxS1Comment"># . if (EAX != 0) return true</span>
+<span id="L2176" class="LineNr">2176 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># compare EAX</span>
+<span id="L2177" class="LineNr">2177 </span>    75/jump-if-not-equal  $has-metadata?:true/disp8
+<span id="L2178" class="LineNr">2178 </span>    <span class="subxComment"># curr = twig-&gt;end</span>
+<span id="L2179" class="LineNr">2179 </span>    8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EDI+4) to ECX</span>
+<span id="L2180" class="LineNr">2180 </span>    eb/jump  $has-metadata?:loop/disp8
+<span id="L2181" class="LineNr">2181 </span><span class="Constant">$has-metadata?:true</span>:
+<span id="L2182" class="LineNr">2182 </span>    b8/copy-to-EAX  1/imm32/true
+<span id="L2183" class="LineNr">2183 </span>    eb/jump  $has-metadata?:end/disp8
+<span id="L2184" class="LineNr">2184 </span><span class="Constant">$has-metadata?:false</span>:
+<span id="L2185" class="LineNr">2185 </span>    b8/copy-to-EAX  0/imm32/false
+<span id="L2186" class="LineNr">2186 </span><span class="Constant">$has-metadata?:end</span>:
+<span id="L2187" class="LineNr">2187 </span>    <span class="subxS1Comment"># . reclaim locals</span>
+<span id="L2188" class="LineNr">2188 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2189" class="LineNr">2189 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L2190" class="LineNr">2190 </span>    5f/pop-to-EDI
+<span id="L2191" class="LineNr">2191 </span>    5e/pop-to-ESI
+<span id="L2192" class="LineNr">2192 </span>    5a/pop-to-EDX
+<span id="L2193" class="LineNr">2193 </span>    59/pop-to-ECX
+<span id="L2194" class="LineNr">2194 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L2195" class="LineNr">2195 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L2196" class="LineNr">2196 </span>    5d/pop-to-EBP
+<span id="L2197" class="LineNr">2197 </span>    c3/return
+<span id="L2198" class="LineNr">2198 </span>
+<span id="L2199" class="LineNr">2199 </span><span class="subxTest">test-has-metadata-true</span>:
+<span id="L2200" class="LineNr">2200 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L2201" class="LineNr">2201 </span>    55/push-EBP
+<span id="L2202" class="LineNr">2202 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L2203" class="LineNr">2203 </span>    <span class="subxComment"># (EAX..ECX) = &quot;ab/c&quot;</span>
+<span id="L2204" class="LineNr">2204 </span>    b8/copy-to-EAX  <span class="Constant">&quot;ab/c&quot;</span>/imm32
+<span id="L2205" class="LineNr">2205 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EAX to ECX</span>
+<span id="L2206" class="LineNr">2206 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX+ECX+4 to ECX</span>
+<span id="L2207" class="LineNr">2207 </span>    05/add-to-EAX  4/imm32
+<span id="L2208" class="LineNr">2208 </span>    <span class="subxComment"># var in/ESI : (address slice) = {EAX, ECX}</span>
+<span id="L2209" class="LineNr">2209 </span>    51/push-ECX
+<span id="L2210" class="LineNr">2210 </span>    50/push-EAX
+<span id="L2211" class="LineNr">2211 </span>    89/copy                         3/mod/direct    6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ESI</span>
+<span id="L2212" class="LineNr">2212 </span>    <span class="subxComment"># EAX = has-metadata?(ESI, &quot;c&quot;)</span>
+<span id="L2213" class="LineNr">2213 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2214" class="LineNr">2214 </span>    68/push  <span class="Constant">&quot;c&quot;</span>/imm32
+<span id="L2215" class="LineNr">2215 </span>    56/push-ESI
+<span id="L2216" class="LineNr">2216 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2217" class="LineNr">2217 </span>    e8/call  <a href='pack.subx.html#L2106'>has-metadata?</a>/disp32
+<span id="L2218" class="LineNr">2218 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2219" class="LineNr">2219 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x8/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2220" class="LineNr">2220 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
+<span id="L2221" class="LineNr">2221 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2222" class="LineNr">2222 </span>    68/push  <span class="Constant">&quot;F - test-has-metadata-true&quot;</span>/imm32
+<span id="L2223" class="LineNr">2223 </span>    68/push  1/imm32/true
+<span id="L2224" class="LineNr">2224 </span>    50/push-EAX
+<span id="L2225" class="LineNr">2225 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2226" class="LineNr">2226 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L2227" class="LineNr">2227 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2228" class="LineNr">2228 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2229" class="LineNr">2229 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L2230" class="LineNr">2230 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L2231" class="LineNr">2231 </span>    5d/pop-to-EBP
+<span id="L2232" class="LineNr">2232 </span>    c3/return
+<span id="L2233" class="LineNr">2233 </span>
+<span id="L2234" class="LineNr">2234 </span><span class="subxTest">test-has-metadata-false</span>:
+<span id="L2235" class="LineNr">2235 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L2236" class="LineNr">2236 </span>    55/push-EBP
+<span id="L2237" class="LineNr">2237 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L2238" class="LineNr">2238 </span>    <span class="subxComment"># (EAX..ECX) = &quot;ab/c&quot;</span>
+<span id="L2239" class="LineNr">2239 </span>    b8/copy-to-EAX  <span class="Constant">&quot;ab/c&quot;</span>/imm32
+<span id="L2240" class="LineNr">2240 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EAX to ECX</span>
+<span id="L2241" class="LineNr">2241 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX+ECX+4 to ECX</span>
+<span id="L2242" class="LineNr">2242 </span>    05/add-to-EAX  4/imm32
+<span id="L2243" class="LineNr">2243 </span>    <span class="subxComment"># var in/ESI : (address slice) = {EAX, ECX}</span>
+<span id="L2244" class="LineNr">2244 </span>    51/push-ECX
+<span id="L2245" class="LineNr">2245 </span>    50/push-EAX
+<span id="L2246" class="LineNr">2246 </span>    89/copy                         3/mod/direct    6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ESI</span>
+<span id="L2247" class="LineNr">2247 </span>    <span class="subxComment"># EAX = has-metadata?(ESI, &quot;c&quot;)</span>
+<span id="L2248" class="LineNr">2248 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2249" class="LineNr">2249 </span>    68/push  <span class="Constant">&quot;d&quot;</span>/imm32
+<span id="L2250" class="LineNr">2250 </span>    56/push-ESI
+<span id="L2251" class="LineNr">2251 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2252" class="LineNr">2252 </span>    e8/call  <a href='pack.subx.html#L2106'>has-metadata?</a>/disp32
+<span id="L2253" class="LineNr">2253 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2254" class="LineNr">2254 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x8/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2255" class="LineNr">2255 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
+<span id="L2256" class="LineNr">2256 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2257" class="LineNr">2257 </span>    68/push  <span class="Constant">&quot;F - test-has-metadata-false&quot;</span>/imm32
+<span id="L2258" class="LineNr">2258 </span>    68/push  0/imm32/false
+<span id="L2259" class="LineNr">2259 </span>    50/push-EAX
+<span id="L2260" class="LineNr">2260 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2261" class="LineNr">2261 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L2262" class="LineNr">2262 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2263" class="LineNr">2263 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2264" class="LineNr">2264 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L2265" class="LineNr">2265 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L2266" class="LineNr">2266 </span>    5d/pop-to-EBP
+<span id="L2267" class="LineNr">2267 </span>    c3/return
+<span id="L2268" class="LineNr">2268 </span>
+<span id="L2269" class="LineNr">2269 </span><span class="subxTest">test-has-metadata-ignore-name</span>:
+<span id="L2270" class="LineNr">2270 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L2271" class="LineNr">2271 </span>    55/push-EBP
+<span id="L2272" class="LineNr">2272 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L2273" class="LineNr">2273 </span>    <span class="subxComment"># (EAX..ECX) = &quot;a/b&quot;</span>
+<span id="L2274" class="LineNr">2274 </span>    b8/copy-to-EAX  <span class="Constant">&quot;a/b&quot;</span>/imm32
+<span id="L2275" class="LineNr">2275 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EAX to ECX</span>
+<span id="L2276" class="LineNr">2276 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX+ECX+4 to ECX</span>
+<span id="L2277" class="LineNr">2277 </span>    05/add-to-EAX  4/imm32
+<span id="L2278" class="LineNr">2278 </span>    <span class="subxComment"># var in/ESI : (address slice) = {EAX, ECX}</span>
+<span id="L2279" class="LineNr">2279 </span>    51/push-ECX
+<span id="L2280" class="LineNr">2280 </span>    50/push-EAX
+<span id="L2281" class="LineNr">2281 </span>    89/copy                         3/mod/direct    6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ESI</span>
+<span id="L2282" class="LineNr">2282 </span>    <span class="subxComment"># EAX = has-metadata?(ESI, &quot;a&quot;)</span>
+<span id="L2283" class="LineNr">2283 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2284" class="LineNr">2284 </span>    68/push  <span class="Constant">&quot;a&quot;</span>/imm32
+<span id="L2285" class="LineNr">2285 </span>    56/push-ESI
+<span id="L2286" class="LineNr">2286 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2287" class="LineNr">2287 </span>    e8/call  <a href='pack.subx.html#L2106'>has-metadata?</a>/disp32
+<span id="L2288" class="LineNr">2288 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2289" class="LineNr">2289 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x8/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2290" class="LineNr">2290 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
+<span id="L2291" class="LineNr">2291 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2292" class="LineNr">2292 </span>    68/push  <span class="Constant">&quot;F - test-has-metadata-ignore-name&quot;</span>/imm32
+<span id="L2293" class="LineNr">2293 </span>    68/push  0/imm32/false
+<span id="L2294" class="LineNr">2294 </span>    50/push-EAX
+<span id="L2295" class="LineNr">2295 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2296" class="LineNr">2296 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L2297" class="LineNr">2297 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2298" class="LineNr">2298 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2299" class="LineNr">2299 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L2300" class="LineNr">2300 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L2301" class="LineNr">2301 </span>    5d/pop-to-EBP
+<span id="L2302" class="LineNr">2302 </span>    c3/return
+<span id="L2303" class="LineNr">2303 </span>
+<span id="L2304" class="LineNr">2304 </span><span class="subxTest">test-has-metadata-multiple-true</span>:
+<span id="L2305" class="LineNr">2305 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L2306" class="LineNr">2306 </span>    55/push-EBP
+<span id="L2307" class="LineNr">2307 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L2308" class="LineNr">2308 </span>    <span class="subxComment"># (EAX..ECX) = &quot;a/b/c&quot;</span>
+<span id="L2309" class="LineNr">2309 </span>    b8/copy-to-EAX  <span class="Constant">&quot;a/b/c&quot;</span>/imm32
+<span id="L2310" class="LineNr">2310 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EAX to ECX</span>
+<span id="L2311" class="LineNr">2311 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX+ECX+4 to ECX</span>
+<span id="L2312" class="LineNr">2312 </span>    05/add-to-EAX  4/imm32
+<span id="L2313" class="LineNr">2313 </span>    <span class="subxComment"># var in/ESI : (address slice) = {EAX, ECX}</span>
+<span id="L2314" class="LineNr">2314 </span>    51/push-ECX
+<span id="L2315" class="LineNr">2315 </span>    50/push-EAX
+<span id="L2316" class="LineNr">2316 </span>    89/copy                         3/mod/direct    6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ESI</span>
+<span id="L2317" class="LineNr">2317 </span>    <span class="subxComment"># EAX = has-metadata?(ESI, &quot;c&quot;)</span>
+<span id="L2318" class="LineNr">2318 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2319" class="LineNr">2319 </span>    68/push  <span class="Constant">&quot;c&quot;</span>/imm32
+<span id="L2320" class="LineNr">2320 </span>    56/push-ESI
+<span id="L2321" class="LineNr">2321 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2322" class="LineNr">2322 </span>    e8/call  <a href='pack.subx.html#L2106'>has-metadata?</a>/disp32
+<span id="L2323" class="LineNr">2323 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2324" class="LineNr">2324 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x8/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2325" class="LineNr">2325 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
+<span id="L2326" class="LineNr">2326 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2327" class="LineNr">2327 </span>    68/push  <span class="Constant">&quot;F - test-has-metadata-multiple-true&quot;</span>/imm32
+<span id="L2328" class="LineNr">2328 </span>    68/push  1/imm32/true
+<span id="L2329" class="LineNr">2329 </span>    50/push-EAX
+<span id="L2330" class="LineNr">2330 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2331" class="LineNr">2331 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L2332" class="LineNr">2332 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2333" class="LineNr">2333 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2334" class="LineNr">2334 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L2335" class="LineNr">2335 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L2336" class="LineNr">2336 </span>    5d/pop-to-EBP
+<span id="L2337" class="LineNr">2337 </span>    c3/return
+<span id="L2338" class="LineNr">2338 </span>
+<span id="L2339" class="LineNr">2339 </span><span class="subxTest">test-has-metadata-multiple-false</span>:
+<span id="L2340" class="LineNr">2340 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L2341" class="LineNr">2341 </span>    55/push-EBP
+<span id="L2342" class="LineNr">2342 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L2343" class="LineNr">2343 </span>    <span class="subxComment"># (EAX..ECX) = &quot;a/b/c&quot;</span>
+<span id="L2344" class="LineNr">2344 </span>    b8/copy-to-EAX  <span class="Constant">&quot;a/b/c&quot;</span>/imm32
+<span id="L2345" class="LineNr">2345 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EAX to ECX</span>
+<span id="L2346" class="LineNr">2346 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX+ECX+4 to ECX</span>
+<span id="L2347" class="LineNr">2347 </span>    05/add-to-EAX  4/imm32
+<span id="L2348" class="LineNr">2348 </span>    <span class="subxComment"># var in/ESI : (address slice) = {EAX, ECX}</span>
+<span id="L2349" class="LineNr">2349 </span>    51/push-ECX
+<span id="L2350" class="LineNr">2350 </span>    50/push-EAX
+<span id="L2351" class="LineNr">2351 </span>    89/copy                         3/mod/direct    6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ESI</span>
+<span id="L2352" class="LineNr">2352 </span>    <span class="subxComment"># EAX = has-metadata?(ESI, &quot;d&quot;)</span>
+<span id="L2353" class="LineNr">2353 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2354" class="LineNr">2354 </span>    68/push  <span class="Constant">&quot;d&quot;</span>/imm32
+<span id="L2355" class="LineNr">2355 </span>    56/push-ESI
+<span id="L2356" class="LineNr">2356 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2357" class="LineNr">2357 </span>    e8/call  <a href='pack.subx.html#L2106'>has-metadata?</a>/disp32
+<span id="L2358" class="LineNr">2358 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2359" class="LineNr">2359 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x8/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2360" class="LineNr">2360 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
+<span id="L2361" class="LineNr">2361 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2362" class="LineNr">2362 </span>    68/push  <span class="Constant">&quot;F - test-has-metadata-multiple-false&quot;</span>/imm32
+<span id="L2363" class="LineNr">2363 </span>    68/push  0/imm32/false
+<span id="L2364" class="LineNr">2364 </span>    50/push-EAX
+<span id="L2365" class="LineNr">2365 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2366" class="LineNr">2366 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L2367" class="LineNr">2367 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2368" class="LineNr">2368 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2369" class="LineNr">2369 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L2370" class="LineNr">2370 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L2371" class="LineNr">2371 </span>    5d/pop-to-EBP
+<span id="L2372" class="LineNr">2372 </span>    c3/return
+<span id="L2373" class="LineNr">2373 </span>
+<span id="L2374" class="LineNr">2374 </span><span class="subxComment"># If value of 'word' is not a valid name, it must be a hex int. Parse and print</span>
+<span id="L2375" class="LineNr">2375 </span><span class="subxComment"># it in 'width' bytes of hex, least significant first.</span>
+<span id="L2376" class="LineNr">2376 </span><span class="subxComment"># Otherwise just print the entire word including metadata.</span>
+<span id="L2377" class="LineNr">2377 </span><span class="subxComment"># Always print a trailing space.</span>
+<span id="L2378" class="LineNr">2378 </span><span class="subxFunction">emit</span>:  <span class="subxComment"># out : (address buffered-file), word : (address slice), width : int -&gt; &lt;void&gt;</span>
+<span id="L2379" class="LineNr">2379 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L2380" class="LineNr">2380 </span>    55/push-EBP
+<span id="L2381" class="LineNr">2381 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L2382" class="LineNr">2382 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L2383" class="LineNr">2383 </span>    50/push-EAX
+<span id="L2384" class="LineNr">2384 </span>    56/push-ESI
+<span id="L2385" class="LineNr">2385 </span>    57/push-EDI
+<span id="L2386" class="LineNr">2386 </span>    <span class="subxComment"># ESI = word</span>
+<span id="L2387" class="LineNr">2387 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to ESI</span>
+<span id="L2388" class="LineNr">2388 </span>    <span class="subxComment"># var name/EDI : (address slice) = {0, 0}</span>
+<span id="L2389" class="LineNr">2389 </span>    68/push  0/imm32/end
+<span id="L2390" class="LineNr">2390 </span>    68/push  0/imm32/start
+<span id="L2391" class="LineNr">2391 </span>    89/copy                         3/mod/direct    7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EDI</span>
+<span id="L2392" class="LineNr">2392 </span>    <span class="subxComment"># name = next-token-from-slice(word-&gt;start, word-&gt;end, '/')</span>
+<span id="L2393" class="LineNr">2393 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2394" class="LineNr">2394 </span>    57/push-EDI
+<span id="L2395" class="LineNr">2395 </span>    68/push  0x2f/imm32/slash
+<span id="L2396" class="LineNr">2396 </span>    ff          6/subop/push        1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(ESI+4)</span>
+<span id="L2397" class="LineNr">2397 </span>    ff          6/subop/push        0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># push *ESI</span>
+<span id="L2398" class="LineNr">2398 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2399" class="LineNr">2399 </span>    e8/call  <a href='../073next-token.subx.html#L168'>next-token-from-slice</a>/disp32
+<span id="L2400" class="LineNr">2400 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2401" class="LineNr">2401 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L2402" class="LineNr">2402 </span>    <span class="subxComment"># if (is-valid-name?(name)) write-slice(out, word) and return</span>
+<span id="L2403" class="LineNr">2403 </span>    <span class="subxS1Comment"># . EAX = is-valid-name?(name)</span>
+<span id="L2404" class="LineNr">2404 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2405" class="LineNr">2405 </span>    57/push-EDI
+<span id="L2406" class="LineNr">2406 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2407" class="LineNr">2407 </span>    e8/call  <a href='pack.subx.html#L2806'>is-valid-name?</a>/disp32
+<span id="L2408" class="LineNr">2408 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2409" class="LineNr">2409 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2410" class="LineNr">2410 </span>    <span class="subxS1Comment"># . if (EAX != 0)</span>
+<span id="L2411" class="LineNr">2411 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># compare EAX</span>
+<span id="L2412" class="LineNr">2412 </span>    74/jump-if-equal  $emit:hex-int/disp8
+<span id="L2413" class="LineNr">2413 </span><span class="Constant">$emit:name</span>:
+<span id="L2414" class="LineNr">2414 </span>    <span class="subxS1Comment"># . write-slice(out, word)</span>
+<span id="L2415" class="LineNr">2415 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2416" class="LineNr">2416 </span>    56/push-ESI
+<span id="L2417" class="LineNr">2417 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L2418" class="LineNr">2418 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2419" class="LineNr">2419 </span>    e8/call  <a href='../072slice.subx.html#L667'>write-slice</a>/disp32
+<span id="L2420" class="LineNr">2420 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2421" class="LineNr">2421 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2422" class="LineNr">2422 </span>    <span class="subxS1Comment"># . write-buffered(out, &quot; &quot;)</span>
+<span id="L2423" class="LineNr">2423 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2424" class="LineNr">2424 </span>    68/push  <span class="Constant">&quot; &quot;</span>/imm32
+<span id="L2425" class="LineNr">2425 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L2426" class="LineNr">2426 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2427" class="LineNr">2427 </span>    e8/call  <a href='../067write-buffered.subx.html#L16'>write-buffered</a>/disp32
+<span id="L2428" class="LineNr">2428 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2429" class="LineNr">2429 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2430" class="LineNr">2430 </span>    <span class="subxS1Comment"># . return</span>
+<span id="L2431" class="LineNr">2431 </span>    eb/jump  $emit:end/disp8
+<span id="L2432" class="LineNr">2432 </span>    <span class="subxComment"># otherwise emit-hex(out, parse-hex-int(name), width)</span>
+<span id="L2433" class="LineNr">2433 </span>    <span class="subxComment">#   (Weird shit can happen here if the value of 'word' isn't either a valid</span>
+<span id="L2434" class="LineNr">2434 </span>    <span class="subxComment">#   name or a hex number, but we're only going to be passing in real legal</span>
+<span id="L2435" class="LineNr">2435 </span>    <span class="subxComment">#   programs. We just want to make sure that valid names aren't treated as</span>
+<span id="L2436" class="LineNr">2436 </span>    <span class="subxComment">#   (valid) hex numbers.)</span>
+<span id="L2437" class="LineNr">2437 </span><span class="Constant">$emit:hex-int</span>:
+<span id="L2438" class="LineNr">2438 </span>    <span class="subxS1Comment"># . n/EAX = parse-hex-int(name)</span>
+<span id="L2439" class="LineNr">2439 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2440" class="LineNr">2440 </span>    57/push-EDI
+<span id="L2441" class="LineNr">2441 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2442" class="LineNr">2442 </span>    e8/call  <a href='../065hex.subx.html#L319'>parse-hex-int</a>/disp32
+<span id="L2443" class="LineNr">2443 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2444" class="LineNr">2444 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2445" class="LineNr">2445 </span>    <span class="subxS1Comment"># . emit-hex(out, n, width)</span>
+<span id="L2446" class="LineNr">2446 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2447" class="LineNr">2447 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
+<span id="L2448" class="LineNr">2448 </span>    50/push-EAX
+<span id="L2449" class="LineNr">2449 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L2450" class="LineNr">2450 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2451" class="LineNr">2451 </span>    e8/call  <a href='pack.subx.html#L3035'>emit-hex</a>/disp32
+<span id="L2452" class="LineNr">2452 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2453" class="LineNr">2453 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2454" class="LineNr">2454 </span><span class="Constant">$emit:end</span>:
+<span id="L2455" class="LineNr">2455 </span>    <span class="subxS1Comment"># . reclaim locals</span>
+<span id="L2456" class="LineNr">2456 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2457" class="LineNr">2457 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L2458" class="LineNr">2458 </span>    5f/pop-to-EDI
+<span id="L2459" class="LineNr">2459 </span>    5e/pop-to-ESI
+<span id="L2460" class="LineNr">2460 </span>    58/pop-to-EAX
+<span id="L2461" class="LineNr">2461 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L2462" class="LineNr">2462 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L2463" class="LineNr">2463 </span>    5d/pop-to-EBP
+<span id="L2464" class="LineNr">2464 </span>    c3/return
+<span id="L2465" class="LineNr">2465 </span>
+<span id="L2466" class="LineNr">2466 </span><span class="subxTest">test-emit-number</span>:
+<span id="L2467" class="LineNr">2467 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L2468" class="LineNr">2468 </span>    55/push-EBP
+<span id="L2469" class="LineNr">2469 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L2470" class="LineNr">2470 </span>    <span class="subxComment"># setup</span>
+<span id="L2471" class="LineNr">2471 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L2472" class="LineNr">2472 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2473" class="LineNr">2473 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L2474" class="LineNr">2474 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2475" class="LineNr">2475 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L2476" class="LineNr">2476 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2477" class="LineNr">2477 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2478" class="LineNr">2478 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
+<span id="L2479" class="LineNr">2479 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2480" class="LineNr">2480 </span>    b8/copy-to-EAX  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L2481" class="LineNr">2481 </span>    05/add-to-EAX  4/imm32
+<span id="L2482" class="LineNr">2482 </span>    50/push-EAX
+<span id="L2483" class="LineNr">2483 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2484" class="LineNr">2484 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L2485" class="LineNr">2485 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2486" class="LineNr">2486 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2487" class="LineNr">2487 </span>    <span class="subxComment"># var slice/ECX = &quot;30&quot;</span>
+<span id="L2488" class="LineNr">2488 </span>    68/push  <a href='pack.subx.html#L3301'>_test-slice-three-zero-end</a>/imm32/end
+<span id="L2489" class="LineNr">2489 </span>    68/push  <a href='pack.subx.html#L3299'>_test-slice-three-zero</a>/imm32/start
+<span id="L2490" class="LineNr">2490 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L2491" class="LineNr">2491 </span>    <span class="subxComment"># emit(_test-buffered-file, slice, 1)</span>
+<span id="L2492" class="LineNr">2492 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2493" class="LineNr">2493 </span>    68/push  1/imm32
+<span id="L2494" class="LineNr">2494 </span>    51/push-ECX
+<span id="L2495" class="LineNr">2495 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L2496" class="LineNr">2496 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2497" class="LineNr">2497 </span>    e8/call  <a href='pack.subx.html#L2378'>emit</a>/disp32
+<span id="L2498" class="LineNr">2498 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2499" class="LineNr">2499 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2500" class="LineNr">2500 </span>    <span class="subxComment"># flush(_test-buffered-file)</span>
+<span id="L2501" class="LineNr">2501 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2502" class="LineNr">2502 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L2503" class="LineNr">2503 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2504" class="LineNr">2504 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
+<span id="L2505" class="LineNr">2505 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2506" class="LineNr">2506 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2507" class="LineNr">2507 </span>    <span class="subxComment"># check-stream-equal(_test-stream, &quot;30 &quot;, msg)</span>
+<span id="L2508" class="LineNr">2508 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2509" class="LineNr">2509 </span>    68/push  <span class="Constant">&quot;F - <a href='pack.subx.html#L2466'>test-emit-number</a>/1&quot;</span>/imm32
+<span id="L2510" class="LineNr">2510 </span>    68/push  <span class="Constant">&quot;30 &quot;</span>/imm32
+<span id="L2511" class="LineNr">2511 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L2512" class="LineNr">2512 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2513" class="LineNr">2513 </span>    e8/call  <a href='../058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
+<span id="L2514" class="LineNr">2514 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2515" class="LineNr">2515 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2516" class="LineNr">2516 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L2517" class="LineNr">2517 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L2518" class="LineNr">2518 </span>    5d/pop-to-EBP
+<span id="L2519" class="LineNr">2519 </span>    c3/return
+<span id="L2520" class="LineNr">2520 </span>
+<span id="L2521" class="LineNr">2521 </span><span class="subxTest">test-emit-negative-number</span>:
+<span id="L2522" class="LineNr">2522 </span>    <span class="subxComment"># test support for sign-extending negative numbers</span>
+<span id="L2523" class="LineNr">2523 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L2524" class="LineNr">2524 </span>    55/push-EBP
+<span id="L2525" class="LineNr">2525 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L2526" class="LineNr">2526 </span>    <span class="subxComment"># setup</span>
+<span id="L2527" class="LineNr">2527 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L2528" class="LineNr">2528 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2529" class="LineNr">2529 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L2530" class="LineNr">2530 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2531" class="LineNr">2531 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L2532" class="LineNr">2532 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2533" class="LineNr">2533 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2534" class="LineNr">2534 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
+<span id="L2535" class="LineNr">2535 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2536" class="LineNr">2536 </span>    b8/copy-to-EAX  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L2537" class="LineNr">2537 </span>    05/add-to-EAX  4/imm32
+<span id="L2538" class="LineNr">2538 </span>    50/push-EAX
+<span id="L2539" class="LineNr">2539 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2540" class="LineNr">2540 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L2541" class="LineNr">2541 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2542" class="LineNr">2542 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2543" class="LineNr">2543 </span>    <span class="subxComment"># var slice/ECX = &quot;-2&quot;</span>
+<span id="L2544" class="LineNr">2544 </span>    68/push  <a href='pack.subx.html#L3295'>_test-slice-negative-two-end</a>/imm32/end
+<span id="L2545" class="LineNr">2545 </span>    68/push  <a href='pack.subx.html#L3293'>_test-slice-negative-two</a>/imm32/start
+<span id="L2546" class="LineNr">2546 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L2547" class="LineNr">2547 </span>    <span class="subxComment"># emit(_test-buffered-file, slice, 2)</span>
+<span id="L2548" class="LineNr">2548 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2549" class="LineNr">2549 </span>    68/push  2/imm32
+<span id="L2550" class="LineNr">2550 </span>    51/push-ECX
+<span id="L2551" class="LineNr">2551 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L2552" class="LineNr">2552 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2553" class="LineNr">2553 </span>    e8/call  <a href='pack.subx.html#L2378'>emit</a>/disp32
+<span id="L2554" class="LineNr">2554 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2555" class="LineNr">2555 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2556" class="LineNr">2556 </span>    <span class="subxComment"># flush(_test-buffered-file)</span>
+<span id="L2557" class="LineNr">2557 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2558" class="LineNr">2558 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L2559" class="LineNr">2559 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2560" class="LineNr">2560 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
+<span id="L2561" class="LineNr">2561 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2562" class="LineNr">2562 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2563" class="LineNr">2563 </span>    <span class="subxComment"># check-stream-equal(_test-stream, &quot;fe ff &quot;, msg)</span>
+<span id="L2564" class="LineNr">2564 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2565" class="LineNr">2565 </span>    68/push  <span class="Constant">&quot;F - <a href='pack.subx.html#L2466'>test-emit-number</a>/1&quot;</span>/imm32
+<span id="L2566" class="LineNr">2566 </span>    68/push  <span class="Constant">&quot;fe ff &quot;</span>/imm32
+<span id="L2567" class="LineNr">2567 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L2568" class="LineNr">2568 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2569" class="LineNr">2569 </span>    e8/call  <a href='../058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
+<span id="L2570" class="LineNr">2570 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2571" class="LineNr">2571 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2572" class="LineNr">2572 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L2573" class="LineNr">2573 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L2574" class="LineNr">2574 </span>    5d/pop-to-EBP
+<span id="L2575" class="LineNr">2575 </span>    c3/return
+<span id="L2576" class="LineNr">2576 </span>
+<span id="L2577" class="LineNr">2577 </span><span class="subxTest">test-emit-number-with-metadata</span>:
+<span id="L2578" class="LineNr">2578 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L2579" class="LineNr">2579 </span>    55/push-EBP
+<span id="L2580" class="LineNr">2580 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L2581" class="LineNr">2581 </span>    <span class="subxComment"># setup</span>
+<span id="L2582" class="LineNr">2582 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L2583" class="LineNr">2583 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2584" class="LineNr">2584 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L2585" class="LineNr">2585 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2586" class="LineNr">2586 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L2587" class="LineNr">2587 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2588" class="LineNr">2588 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2589" class="LineNr">2589 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
+<span id="L2590" class="LineNr">2590 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2591" class="LineNr">2591 </span>    b8/copy-to-EAX  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L2592" class="LineNr">2592 </span>    05/add-to-EAX  4/imm32
+<span id="L2593" class="LineNr">2593 </span>    50/push-EAX
+<span id="L2594" class="LineNr">2594 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2595" class="LineNr">2595 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L2596" class="LineNr">2596 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2597" class="LineNr">2597 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2598" class="LineNr">2598 </span>    <span class="subxComment"># var slice/ECX = &quot;-2/foo&quot;</span>
+<span id="L2599" class="LineNr">2599 </span>    68/push  <a href='pack.subx.html#L3297'>_test-slice-negative-two-metadata-end</a>/imm32/end
+<span id="L2600" class="LineNr">2600 </span>    68/push  <a href='pack.subx.html#L3293'>_test-slice-negative-two</a>/imm32/start
+<span id="L2601" class="LineNr">2601 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L2602" class="LineNr">2602 </span>    <span class="subxComment"># emit(_test-buffered-file, slice, 2)</span>
+<span id="L2603" class="LineNr">2603 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2604" class="LineNr">2604 </span>    68/push  2/imm32
+<span id="L2605" class="LineNr">2605 </span>    51/push-ECX
+<span id="L2606" class="LineNr">2606 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L2607" class="LineNr">2607 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2608" class="LineNr">2608 </span>    e8/call  <a href='pack.subx.html#L2378'>emit</a>/disp32
+<span id="L2609" class="LineNr">2609 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2610" class="LineNr">2610 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2611" class="LineNr">2611 </span>    <span class="subxComment"># flush(_test-buffered-file)</span>
+<span id="L2612" class="LineNr">2612 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2613" class="LineNr">2613 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L2614" class="LineNr">2614 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2615" class="LineNr">2615 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
+<span id="L2616" class="LineNr">2616 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2617" class="LineNr">2617 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2618" class="LineNr">2618 </span>    <span class="subxComment"># the '/foo' will have no impact on the output</span>
+<span id="L2619" class="LineNr">2619 </span>    <span class="subxComment"># check-stream-equal(_test-stream, &quot;fe ff &quot;, msg)</span>
+<span id="L2620" class="LineNr">2620 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2621" class="LineNr">2621 </span>    68/push  <span class="Constant">&quot;F - test-emit-number-with-metadata&quot;</span>/imm32
+<span id="L2622" class="LineNr">2622 </span>    68/push  <span class="Constant">&quot;fe ff &quot;</span>/imm32
+<span id="L2623" class="LineNr">2623 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L2624" class="LineNr">2624 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2625" class="LineNr">2625 </span>    e8/call  <a href='../058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
+<span id="L2626" class="LineNr">2626 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2627" class="LineNr">2627 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2628" class="LineNr">2628 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L2629" class="LineNr">2629 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L2630" class="LineNr">2630 </span>    5d/pop-to-EBP
+<span id="L2631" class="LineNr">2631 </span>    c3/return
+<span id="L2632" class="LineNr">2632 </span>
+<span id="L2633" class="LineNr">2633 </span><span class="subxTest">test-emit-non-number</span>:
+<span id="L2634" class="LineNr">2634 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L2635" class="LineNr">2635 </span>    55/push-EBP
+<span id="L2636" class="LineNr">2636 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L2637" class="LineNr">2637 </span>    <span class="subxComment"># setup</span>
+<span id="L2638" class="LineNr">2638 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L2639" class="LineNr">2639 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2640" class="LineNr">2640 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L2641" class="LineNr">2641 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2642" class="LineNr">2642 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L2643" class="LineNr">2643 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2644" class="LineNr">2644 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2645" class="LineNr">2645 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
+<span id="L2646" class="LineNr">2646 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2647" class="LineNr">2647 </span>    b8/copy-to-EAX  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L2648" class="LineNr">2648 </span>    05/add-to-EAX  4/imm32
+<span id="L2649" class="LineNr">2649 </span>    50/push-EAX
+<span id="L2650" class="LineNr">2650 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2651" class="LineNr">2651 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L2652" class="LineNr">2652 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2653" class="LineNr">2653 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2654" class="LineNr">2654 </span>    <span class="subxComment"># var slice/ECX = &quot;xyz&quot;</span>
+<span id="L2655" class="LineNr">2655 </span>    68/push  <a href='pack.subx.html#L3305'>_test-slice-non-number-word-end</a>/imm32/end
+<span id="L2656" class="LineNr">2656 </span>    68/push  <a href='pack.subx.html#L3303'>_test-slice-non-number-word</a>/imm32/start
+<span id="L2657" class="LineNr">2657 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L2658" class="LineNr">2658 </span>    <span class="subxComment"># emit(_test-buffered-file, slice, 2)</span>
+<span id="L2659" class="LineNr">2659 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2660" class="LineNr">2660 </span>    68/push  2/imm32
+<span id="L2661" class="LineNr">2661 </span>    51/push-ECX
+<span id="L2662" class="LineNr">2662 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L2663" class="LineNr">2663 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2664" class="LineNr">2664 </span>    e8/call  <a href='pack.subx.html#L2378'>emit</a>/disp32
+<span id="L2665" class="LineNr">2665 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2666" class="LineNr">2666 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2667" class="LineNr">2667 </span>    <span class="subxComment"># flush(_test-buffered-file)</span>
+<span id="L2668" class="LineNr">2668 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2669" class="LineNr">2669 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L2670" class="LineNr">2670 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2671" class="LineNr">2671 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
+<span id="L2672" class="LineNr">2672 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2673" class="LineNr">2673 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2674" class="LineNr">2674 </span>    <span class="subxComment"># check-stream-equal(_test-stream, &quot;xyz&quot;, msg)</span>
+<span id="L2675" class="LineNr">2675 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2676" class="LineNr">2676 </span>    68/push  <span class="Constant">&quot;F - test-emit-non-number&quot;</span>/imm32
+<span id="L2677" class="LineNr">2677 </span>    68/push  <span class="Constant">&quot;xyz &quot;</span>/imm32
+<span id="L2678" class="LineNr">2678 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L2679" class="LineNr">2679 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2680" class="LineNr">2680 </span>    e8/call  <a href='../058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
+<span id="L2681" class="LineNr">2681 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2682" class="LineNr">2682 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2683" class="LineNr">2683 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L2684" class="LineNr">2684 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L2685" class="LineNr">2685 </span>    5d/pop-to-EBP
+<span id="L2686" class="LineNr">2686 </span>    c3/return
+<span id="L2687" class="LineNr">2687 </span>
+<span id="L2688" class="LineNr">2688 </span><span class="subxTest">test-emit-non-number-with-metadata</span>:
+<span id="L2689" class="LineNr">2689 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L2690" class="LineNr">2690 </span>    55/push-EBP
+<span id="L2691" class="LineNr">2691 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L2692" class="LineNr">2692 </span>    <span class="subxComment"># setup</span>
+<span id="L2693" class="LineNr">2693 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L2694" class="LineNr">2694 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2695" class="LineNr">2695 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L2696" class="LineNr">2696 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2697" class="LineNr">2697 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L2698" class="LineNr">2698 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2699" class="LineNr">2699 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2700" class="LineNr">2700 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
+<span id="L2701" class="LineNr">2701 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2702" class="LineNr">2702 </span>    b8/copy-to-EAX  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L2703" class="LineNr">2703 </span>    05/add-to-EAX  4/imm32
+<span id="L2704" class="LineNr">2704 </span>    50/push-EAX
+<span id="L2705" class="LineNr">2705 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2706" class="LineNr">2706 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L2707" class="LineNr">2707 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2708" class="LineNr">2708 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2709" class="LineNr">2709 </span>    <span class="subxComment"># var slice/ECX = &quot;xyz/&quot;</span>
+<span id="L2710" class="LineNr">2710 </span>    68/push  <a href='pack.subx.html#L3307'>_test-slice-non-number-word-metadata-end</a>/imm32/end
+<span id="L2711" class="LineNr">2711 </span>    68/push  <a href='pack.subx.html#L3303'>_test-slice-non-number-word</a>/imm32/start
+<span id="L2712" class="LineNr">2712 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L2713" class="LineNr">2713 </span>    <span class="subxComment"># emit(_test-buffered-file, slice, 2)</span>
+<span id="L2714" class="LineNr">2714 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2715" class="LineNr">2715 </span>    68/push  2/imm32
+<span id="L2716" class="LineNr">2716 </span>    51/push-ECX
+<span id="L2717" class="LineNr">2717 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L2718" class="LineNr">2718 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2719" class="LineNr">2719 </span>    e8/call  <a href='pack.subx.html#L2378'>emit</a>/disp32
+<span id="L2720" class="LineNr">2720 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2721" class="LineNr">2721 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2722" class="LineNr">2722 </span>    <span class="subxComment"># flush(_test-buffered-file)</span>
+<span id="L2723" class="LineNr">2723 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2724" class="LineNr">2724 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L2725" class="LineNr">2725 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2726" class="LineNr">2726 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
+<span id="L2727" class="LineNr">2727 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2728" class="LineNr">2728 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2729" class="LineNr">2729 </span>    <span class="subxComment"># check-stream-equal(_test-stream, &quot;xyz/&quot;, msg)</span>
+<span id="L2730" class="LineNr">2730 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2731" class="LineNr">2731 </span>    68/push  <span class="Constant">&quot;F - test-emit-non-number-with-metadata&quot;</span>/imm32
+<span id="L2732" class="LineNr">2732 </span>    68/push  <span class="Constant">&quot;xyz/ &quot;</span>/imm32
+<span id="L2733" class="LineNr">2733 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L2734" class="LineNr">2734 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2735" class="LineNr">2735 </span>    e8/call  <a href='../058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
+<span id="L2736" class="LineNr">2736 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2737" class="LineNr">2737 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2738" class="LineNr">2738 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L2739" class="LineNr">2739 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L2740" class="LineNr">2740 </span>    5d/pop-to-EBP
+<span id="L2741" class="LineNr">2741 </span>    c3/return
+<span id="L2742" class="LineNr">2742 </span>
+<span id="L2743" class="LineNr">2743 </span><span class="subxTest">test-emit-non-number-with-all-hex-digits-and-metadata</span>:
+<span id="L2744" class="LineNr">2744 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L2745" class="LineNr">2745 </span>    55/push-EBP
+<span id="L2746" class="LineNr">2746 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L2747" class="LineNr">2747 </span>    <span class="subxComment"># setup</span>
+<span id="L2748" class="LineNr">2748 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L2749" class="LineNr">2749 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2750" class="LineNr">2750 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L2751" class="LineNr">2751 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2752" class="LineNr">2752 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L2753" class="LineNr">2753 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2754" class="LineNr">2754 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2755" class="LineNr">2755 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
+<span id="L2756" class="LineNr">2756 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2757" class="LineNr">2757 </span>    b8/copy-to-EAX  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L2758" class="LineNr">2758 </span>    05/add-to-EAX  4/imm32
+<span id="L2759" class="LineNr">2759 </span>    50/push-EAX
+<span id="L2760" class="LineNr">2760 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2761" class="LineNr">2761 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L2762" class="LineNr">2762 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2763" class="LineNr">2763 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2764" class="LineNr">2764 </span>    <span class="subxComment"># var slice/ECX = &quot;abcd/xyz&quot;</span>
+<span id="L2765" class="LineNr">2765 </span>    68/push  <a href='pack.subx.html#L3366'>_test-slice-hexlike-non-number-word-metadata-end</a>/imm32/end
+<span id="L2766" class="LineNr">2766 </span>    68/push  <a href='pack.subx.html#L3361'>_test-slice-hexlike-non-number-word</a>/imm32/start
+<span id="L2767" class="LineNr">2767 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L2768" class="LineNr">2768 </span>    <span class="subxComment"># emit(_test-buffered-file, slice, 2)</span>
+<span id="L2769" class="LineNr">2769 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2770" class="LineNr">2770 </span>    68/push  2/imm32
+<span id="L2771" class="LineNr">2771 </span>    51/push-ECX
+<span id="L2772" class="LineNr">2772 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L2773" class="LineNr">2773 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2774" class="LineNr">2774 </span>    e8/call  <a href='pack.subx.html#L2378'>emit</a>/disp32
+<span id="L2775" class="LineNr">2775 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2776" class="LineNr">2776 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2777" class="LineNr">2777 </span>    <span class="subxComment"># flush(_test-buffered-file)</span>
+<span id="L2778" class="LineNr">2778 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2779" class="LineNr">2779 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L2780" class="LineNr">2780 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2781" class="LineNr">2781 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
+<span id="L2782" class="LineNr">2782 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2783" class="LineNr">2783 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2784" class="LineNr">2784 </span>    <span class="subxComment"># check-stream-equal(_test-stream, &quot;abcd/xyz&quot;)</span>
+<span id="L2785" class="LineNr">2785 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2786" class="LineNr">2786 </span>    68/push  <span class="Constant">&quot;F - test-emit-non-number-with-all-hex-digits&quot;</span>/imm32
+<span id="L2787" class="LineNr">2787 </span>    68/push  <span class="Constant">&quot;abcd/xyz&quot;</span>/imm32
+<span id="L2788" class="LineNr">2788 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L2789" class="LineNr">2789 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2790" class="LineNr">2790 </span>    e8/call  <a href='../058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
+<span id="L2791" class="LineNr">2791 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2792" class="LineNr">2792 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2793" class="LineNr">2793 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L2794" class="LineNr">2794 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L2795" class="LineNr">2795 </span>    5d/pop-to-EBP
+<span id="L2796" class="LineNr">2796 </span>    c3/return
+<span id="L2797" class="LineNr">2797 </span>
+<span id="L2798" class="LineNr">2798 </span><span class="subxComment"># conditions for 'valid' names that are not at risk of looking like hex numbers</span>
+<span id="L2799" class="LineNr">2799 </span><span class="subxComment"># keep in sync with the rules in labels.cc</span>
+<span id="L2800" class="LineNr">2800 </span><span class="subxComment">#: - if it starts with a digit, it's treated as a number. If it can't be</span>
+<span id="L2801" class="LineNr">2801 </span><span class="subxComment">#:   parsed as hex it will raise an error.</span>
+<span id="L2802" class="LineNr">2802 </span><span class="subxComment">#: - if it starts with '-' it's treated as a number.</span>
+<span id="L2803" class="LineNr">2803 </span><span class="subxComment">#: - if it starts with '0x' it's treated as a number. (redundant)</span>
+<span id="L2804" class="LineNr">2804 </span><span class="subxComment">#: - if it's two characters long, it can't be a name. Either it's a hex</span>
+<span id="L2805" class="LineNr">2805 </span><span class="subxComment">#:   byte, or it raises an error.</span>
+<span id="L2806" class="LineNr">2806 </span><span class="subxFunction">is-valid-name?</span>:  <span class="subxComment"># in : (address slice) -&gt; EAX : boolean</span>
+<span id="L2807" class="LineNr">2807 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L2808" class="LineNr">2808 </span>    55/push-EBP
+<span id="L2809" class="LineNr">2809 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L2810" class="LineNr">2810 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L2811" class="LineNr">2811 </span>    51/push-ECX
+<span id="L2812" class="LineNr">2812 </span>    56/push-ESI
+<span id="L2813" class="LineNr">2813 </span>    <span class="subxComment"># ESI = in</span>
+<span id="L2814" class="LineNr">2814 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
+<span id="L2815" class="LineNr">2815 </span>    <span class="subxComment"># start/ECX = in-&gt;start</span>
+<span id="L2816" class="LineNr">2816 </span>    8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ESI to ECX</span>
+<span id="L2817" class="LineNr">2817 </span>    <span class="subxComment"># end/EAX = in-&gt;end</span>
+<span id="L2818" class="LineNr">2818 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESI+4) to EAX</span>
+<span id="L2819" class="LineNr">2819 </span><span class="Constant">$is-valid-name?:check0</span>:
+<span id="L2820" class="LineNr">2820 </span>    <span class="subxComment"># if (start &gt;= end) return false</span>
+<span id="L2821" class="LineNr">2821 </span>    39/compare                      3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare ECX with EAX</span>
+<span id="L2822" class="LineNr">2822 </span>    7d/jump-if-greater-or-equal  $is-valid-name?:false/disp8
+<span id="L2823" class="LineNr">2823 </span><span class="Constant">$is-valid-name?:check1</span>:
+<span id="L2824" class="LineNr">2824 </span>    <span class="subxComment"># EAX -= ECX</span>
+<span id="L2825" class="LineNr">2825 </span>    29/subtract                     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># subtract ECX from EAX</span>
+<span id="L2826" class="LineNr">2826 </span>    <span class="subxComment"># if (EAX == 2) return false</span>
+<span id="L2827" class="LineNr">2827 </span>    3d/compare-with-EAX  2/imm32
+<span id="L2828" class="LineNr">2828 </span>    74/jump-if-equal  $is-valid-name?:false/disp8
+<span id="L2829" class="LineNr">2829 </span><span class="Constant">$is-valid-name?:check2</span>:
+<span id="L2830" class="LineNr">2830 </span>    <span class="subxComment"># c/EAX = *ECX</span>
+<span id="L2831" class="LineNr">2831 </span>    31/xor                          3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EAX</span>
+<span id="L2832" class="LineNr">2832 </span>    8a/copy-byte                    0/mod/indirect  1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/AL   <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *ECX to AL</span>
+<span id="L2833" class="LineNr">2833 </span>    <span class="subxComment"># if (c == &quot;-&quot;) return false</span>
+<span id="L2834" class="LineNr">2834 </span>    3d/compare-with-EAX  2d/imm32/-
+<span id="L2835" class="LineNr">2835 </span>    74/jump-if-equal  $is-valid-name?:false/disp8
+<span id="L2836" class="LineNr">2836 </span><span class="Constant">$is-valid-name?:check3a</span>:
+<span id="L2837" class="LineNr">2837 </span>    <span class="subxComment"># if (c &lt; &quot;0&quot;) return true</span>
+<span id="L2838" class="LineNr">2838 </span>    3d/compare-with-EAX  30/imm32/0
+<span id="L2839" class="LineNr">2839 </span>    7c/jump-if-lesser  $is-valid-name?:true/disp8
+<span id="L2840" class="LineNr">2840 </span><span class="Constant">$is-valid-name?:check3b</span>:
+<span id="L2841" class="LineNr">2841 </span>    <span class="subxComment"># if (c &gt; &quot;9&quot;) return true</span>
+<span id="L2842" class="LineNr">2842 </span>    3d/compare-with-EAX  39/imm32/9
+<span id="L2843" class="LineNr">2843 </span>    7f/jump-if-greater  $is-valid-name?:true/disp8
+<span id="L2844" class="LineNr">2844 </span><span class="Constant">$is-valid-name?:false</span>:
+<span id="L2845" class="LineNr">2845 </span>    <span class="subxComment"># return false</span>
+<span id="L2846" class="LineNr">2846 </span>    b8/copy-to-EAX  0/imm32/false
+<span id="L2847" class="LineNr">2847 </span>    eb/jump  $is-valid-name?:end/disp8
+<span id="L2848" class="LineNr">2848 </span><span class="Constant">$is-valid-name?:true</span>:
+<span id="L2849" class="LineNr">2849 </span>    <span class="subxComment"># return true</span>
+<span id="L2850" class="LineNr">2850 </span>    b8/copy-to-EAX  1/imm32/true
+<span id="L2851" class="LineNr">2851 </span><span class="Constant">$is-valid-name?:end</span>:
+<span id="L2852" class="LineNr">2852 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L2853" class="LineNr">2853 </span>    5e/pop-to-ESI
+<span id="L2854" class="LineNr">2854 </span>    59/pop-to-ECX
+<span id="L2855" class="LineNr">2855 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L2856" class="LineNr">2856 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L2857" class="LineNr">2857 </span>    5d/pop-to-EBP
+<span id="L2858" class="LineNr">2858 </span>    c3/return
+<span id="L2859" class="LineNr">2859 </span>
+<span id="L2860" class="LineNr">2860 </span><span class="subxTest">test-is-valid-name-digit-prefix</span>:
+<span id="L2861" class="LineNr">2861 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L2862" class="LineNr">2862 </span>    55/push-EBP
+<span id="L2863" class="LineNr">2863 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L2864" class="LineNr">2864 </span>    <span class="subxComment"># var slice/ECX = &quot;34&quot;</span>
+<span id="L2865" class="LineNr">2865 </span>    68/push  <a href='../065hex.subx.html#L764'>_test-slice-hex-int-end</a>/imm32
+<span id="L2866" class="LineNr">2866 </span>    68/push  <a href='../065hex.subx.html#L762'>_test-slice-hex-int</a>/imm32
+<span id="L2867" class="LineNr">2867 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L2868" class="LineNr">2868 </span>    <span class="subxComment"># EAX = is-valid-name?(slice)</span>
+<span id="L2869" class="LineNr">2869 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2870" class="LineNr">2870 </span>    51/push-ECX
+<span id="L2871" class="LineNr">2871 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2872" class="LineNr">2872 </span>    e8/call  <a href='pack.subx.html#L2806'>is-valid-name?</a>/disp32
+<span id="L2873" class="LineNr">2873 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2874" class="LineNr">2874 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2875" class="LineNr">2875 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
+<span id="L2876" class="LineNr">2876 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2877" class="LineNr">2877 </span>    68/push  <span class="Constant">&quot;F - test-is-valid-name-digit-prefix&quot;</span>/imm32
+<span id="L2878" class="LineNr">2878 </span>    68/push  0/imm32/false
+<span id="L2879" class="LineNr">2879 </span>    50/push-EAX
+<span id="L2880" class="LineNr">2880 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2881" class="LineNr">2881 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L2882" class="LineNr">2882 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2883" class="LineNr">2883 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2884" class="LineNr">2884 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L2885" class="LineNr">2885 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L2886" class="LineNr">2886 </span>    5d/pop-to-EBP
+<span id="L2887" class="LineNr">2887 </span>    c3/return
+<span id="L2888" class="LineNr">2888 </span>
+<span id="L2889" class="LineNr">2889 </span><span class="subxTest">test-is-valid-name-negative-prefix</span>:
+<span id="L2890" class="LineNr">2890 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L2891" class="LineNr">2891 </span>    55/push-EBP
+<span id="L2892" class="LineNr">2892 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L2893" class="LineNr">2893 </span>    <span class="subxComment"># var slice/ECX = &quot;-0x34&quot;</span>
+<span id="L2894" class="LineNr">2894 </span>    68/push  <a href='../065hex.subx.html#L788'>_test-slice-hex-int-with-0x-prefix-end</a>/imm32
+<span id="L2895" class="LineNr">2895 </span>    68/push  <a href='../065hex.subx.html#L784'>_test-slice-hex-int-with-0x-prefix-negative</a>/imm32
+<span id="L2896" class="LineNr">2896 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L2897" class="LineNr">2897 </span>    <span class="subxComment"># EAX = is-valid-name?(slice)</span>
+<span id="L2898" class="LineNr">2898 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2899" class="LineNr">2899 </span>    51/push-ECX
+<span id="L2900" class="LineNr">2900 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2901" class="LineNr">2901 </span>    e8/call  <a href='pack.subx.html#L2806'>is-valid-name?</a>/disp32
+<span id="L2902" class="LineNr">2902 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2903" class="LineNr">2903 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2904" class="LineNr">2904 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
+<span id="L2905" class="LineNr">2905 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2906" class="LineNr">2906 </span>    68/push  <span class="Constant">&quot;F - test-is-valid-name-negative-prefix&quot;</span>/imm32
+<span id="L2907" class="LineNr">2907 </span>    68/push  0/imm32/false
+<span id="L2908" class="LineNr">2908 </span>    50/push-EAX
+<span id="L2909" class="LineNr">2909 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2910" class="LineNr">2910 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L2911" class="LineNr">2911 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2912" class="LineNr">2912 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2913" class="LineNr">2913 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L2914" class="LineNr">2914 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L2915" class="LineNr">2915 </span>    5d/pop-to-EBP
+<span id="L2916" class="LineNr">2916 </span>    c3/return
+<span id="L2917" class="LineNr">2917 </span>
+<span id="L2918" class="LineNr">2918 </span><span class="subxTest">test-is-valid-name-0x-prefix</span>:
+<span id="L2919" class="LineNr">2919 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L2920" class="LineNr">2920 </span>    55/push-EBP
+<span id="L2921" class="LineNr">2921 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L2922" class="LineNr">2922 </span>    <span class="subxComment"># var slice/ECX = &quot;0x34&quot;</span>
+<span id="L2923" class="LineNr">2923 </span>    68/push  <a href='../065hex.subx.html#L788'>_test-slice-hex-int-with-0x-prefix-end</a>/imm32
+<span id="L2924" class="LineNr">2924 </span>    68/push  <a href='../065hex.subx.html#L786'>_test-slice-hex-int-with-0x-prefix</a>/imm32
+<span id="L2925" class="LineNr">2925 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L2926" class="LineNr">2926 </span>    <span class="subxComment"># EAX = is-valid-name?(slice)</span>
+<span id="L2927" class="LineNr">2927 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2928" class="LineNr">2928 </span>    51/push-ECX
+<span id="L2929" class="LineNr">2929 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2930" class="LineNr">2930 </span>    e8/call  <a href='pack.subx.html#L2806'>is-valid-name?</a>/disp32
+<span id="L2931" class="LineNr">2931 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2932" class="LineNr">2932 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2933" class="LineNr">2933 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
+<span id="L2934" class="LineNr">2934 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2935" class="LineNr">2935 </span>    68/push  <span class="Constant">&quot;F - test-is-valid-name-0x-prefix&quot;</span>/imm32
+<span id="L2936" class="LineNr">2936 </span>    68/push  0/imm32/false
+<span id="L2937" class="LineNr">2937 </span>    50/push-EAX
+<span id="L2938" class="LineNr">2938 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2939" class="LineNr">2939 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L2940" class="LineNr">2940 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2941" class="LineNr">2941 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2942" class="LineNr">2942 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L2943" class="LineNr">2943 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L2944" class="LineNr">2944 </span>    5d/pop-to-EBP
+<span id="L2945" class="LineNr">2945 </span>    c3/return
+<span id="L2946" class="LineNr">2946 </span>
+<span id="L2947" class="LineNr">2947 </span><span class="subxTest">test-is-valid-name-starts-with-pre-digit</span>:
+<span id="L2948" class="LineNr">2948 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L2949" class="LineNr">2949 </span>    55/push-EBP
+<span id="L2950" class="LineNr">2950 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L2951" class="LineNr">2951 </span>    <span class="subxComment"># var slice/ECX = &quot;/03&quot;</span>
+<span id="L2952" class="LineNr">2952 </span>    68/push  <a href='pack.subx.html#L3370'>_test-slice-with-slash-prefix-end</a>/imm32
+<span id="L2953" class="LineNr">2953 </span>    68/push  <a href='pack.subx.html#L3368'>_test-slice-with-slash-prefix</a>/imm32
+<span id="L2954" class="LineNr">2954 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L2955" class="LineNr">2955 </span>    <span class="subxComment"># EAX = is-valid-name?(slice)</span>
+<span id="L2956" class="LineNr">2956 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2957" class="LineNr">2957 </span>    51/push-ECX
+<span id="L2958" class="LineNr">2958 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2959" class="LineNr">2959 </span>    e8/call  <a href='pack.subx.html#L2806'>is-valid-name?</a>/disp32
+<span id="L2960" class="LineNr">2960 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2961" class="LineNr">2961 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2962" class="LineNr">2962 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
+<span id="L2963" class="LineNr">2963 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2964" class="LineNr">2964 </span>    68/push  <span class="Constant">&quot;F - test-is-valid-name-starts-with-pre-digit&quot;</span>/imm32
+<span id="L2965" class="LineNr">2965 </span>    68/push  1/imm32/true
+<span id="L2966" class="LineNr">2966 </span>    50/push-EAX
+<span id="L2967" class="LineNr">2967 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2968" class="LineNr">2968 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L2969" class="LineNr">2969 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2970" class="LineNr">2970 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L2971" class="LineNr">2971 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L2972" class="LineNr">2972 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L2973" class="LineNr">2973 </span>    5d/pop-to-EBP
+<span id="L2974" class="LineNr">2974 </span>    c3/return
+<span id="L2975" class="LineNr">2975 </span>
+<span id="L2976" class="LineNr">2976 </span><span class="subxTest">test-is-valid-name-starts-with-post-digit</span>:
+<span id="L2977" class="LineNr">2977 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L2978" class="LineNr">2978 </span>    55/push-EBP
+<span id="L2979" class="LineNr">2979 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L2980" class="LineNr">2980 </span>    <span class="subxComment"># var slice/ECX = &quot;q34&quot;</span>
+<span id="L2981" class="LineNr">2981 </span>    68/push  <a href='../065hex.subx.html#L778'>_test-slice-char-and-digits-end</a>/imm32
+<span id="L2982" class="LineNr">2982 </span>    68/push  <a href='../065hex.subx.html#L776'>_test-slice-char-and-digits</a>/imm32
+<span id="L2983" class="LineNr">2983 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L2984" class="LineNr">2984 </span>    <span class="subxComment"># EAX = is-valid-name?(slice)</span>
+<span id="L2985" class="LineNr">2985 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2986" class="LineNr">2986 </span>    51/push-ECX
+<span id="L2987" class="LineNr">2987 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2988" class="LineNr">2988 </span>    e8/call  <a href='pack.subx.html#L2806'>is-valid-name?</a>/disp32
+<span id="L2989" class="LineNr">2989 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2990" class="LineNr">2990 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L2991" class="LineNr">2991 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
+<span id="L2992" class="LineNr">2992 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L2993" class="LineNr">2993 </span>    68/push  <span class="Constant">&quot;F - test-is-valid-name-starts-with-post-digit&quot;</span>/imm32
+<span id="L2994" class="LineNr">2994 </span>    68/push  1/imm32/true
+<span id="L2995" class="LineNr">2995 </span>    50/push-EAX
+<span id="L2996" class="LineNr">2996 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L2997" class="LineNr">2997 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L2998" class="LineNr">2998 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L2999" class="LineNr">2999 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L3000" class="LineNr">3000 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L3001" class="LineNr">3001 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L3002" class="LineNr">3002 </span>    5d/pop-to-EBP
+<span id="L3003" class="LineNr">3003 </span>    c3/return
+<span id="L3004" class="LineNr">3004 </span>
+<span id="L3005" class="LineNr">3005 </span><span class="subxTest">test-is-valid-name-starts-with-digit</span>:
+<span id="L3006" class="LineNr">3006 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L3007" class="LineNr">3007 </span>    55/push-EBP
+<span id="L3008" class="LineNr">3008 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L3009" class="LineNr">3009 </span>    <span class="subxComment"># var slice/ECX = &quot;0x34&quot;</span>
+<span id="L3010" class="LineNr">3010 </span>    68/push  <a href='../065hex.subx.html#L788'>_test-slice-hex-int-with-0x-prefix-end</a>/imm32
+<span id="L3011" class="LineNr">3011 </span>    68/push  <a href='../065hex.subx.html#L786'>_test-slice-hex-int-with-0x-prefix</a>/imm32
+<span id="L3012" class="LineNr">3012 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L3013" class="LineNr">3013 </span>    <span class="subxComment"># EAX = is-valid-name?(slice)</span>
+<span id="L3014" class="LineNr">3014 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L3015" class="LineNr">3015 </span>    51/push-ECX
+<span id="L3016" class="LineNr">3016 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L3017" class="LineNr">3017 </span>    e8/call  <a href='pack.subx.html#L2806'>is-valid-name?</a>/disp32
+<span id="L3018" class="LineNr">3018 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L3019" class="LineNr">3019 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L3020" class="LineNr">3020 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
+<span id="L3021" class="LineNr">3021 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L3022" class="LineNr">3022 </span>    68/push  <span class="Constant">&quot;F - test-is-valid-name-starts-with-digit&quot;</span>/imm32
+<span id="L3023" class="LineNr">3023 </span>    68/push  0/imm32/false
+<span id="L3024" class="LineNr">3024 </span>    50/push-EAX
+<span id="L3025" class="LineNr">3025 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L3026" class="LineNr">3026 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L3027" class="LineNr">3027 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L3028" class="LineNr">3028 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L3029" class="LineNr">3029 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L3030" class="LineNr">3030 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L3031" class="LineNr">3031 </span>    5d/pop-to-EBP
+<span id="L3032" class="LineNr">3032 </span>    c3/return
+<span id="L3033" class="LineNr">3033 </span>
+<span id="L3034" class="LineNr">3034 </span><span class="subxComment"># print 'n' in hex in 'width' bytes in lower-endian order, with a space after every byte</span>
+<span id="L3035" class="LineNr">3035 </span><span class="subxFunction">emit-hex</span>:  <span class="subxComment"># out : (address buffered-file), n : int, width : int -&gt; &lt;void&gt;</span>
+<span id="L3036" class="LineNr">3036 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L3037" class="LineNr">3037 </span>    55/push-EBP
+<span id="L3038" class="LineNr">3038 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L3039" class="LineNr">3039 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L3040" class="LineNr">3040 </span>    50/push-EAX
+<span id="L3041" class="LineNr">3041 </span>    51/push-ECX
+<span id="L3042" class="LineNr">3042 </span>    52/push-EDX
+<span id="L3043" class="LineNr">3043 </span>    53/push-EBX
+<span id="L3044" class="LineNr">3044 </span>    57/push-EDI
+<span id="L3045" class="LineNr">3045 </span>    <span class="subxComment"># EDI = out</span>
+<span id="L3046" class="LineNr">3046 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          7/r32/EDI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EDI</span>
+<span id="L3047" class="LineNr">3047 </span>    <span class="subxComment"># EBX = n</span>
+<span id="L3048" class="LineNr">3048 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EBX</span>
+<span id="L3049" class="LineNr">3049 </span>    <span class="subxComment"># EDX = width</span>
+<span id="L3050" class="LineNr">3050 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+16) to EDX</span>
+<span id="L3051" class="LineNr">3051 </span>    <span class="subxComment"># var curr/ECX = 0</span>
+<span id="L3052" class="LineNr">3052 </span>    31/xor                          3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear ECX</span>
+<span id="L3053" class="LineNr">3053 </span><span class="Constant">$emit-hex:loop</span>:
+<span id="L3054" class="LineNr">3054 </span>    <span class="subxComment"># if (curr &gt;= width) break</span>
+<span id="L3055" class="LineNr">3055 </span>    39/compare                      3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare ECX and EDX</span>
+<span id="L3056" class="LineNr">3056 </span>    7d/jump-if-greater-or-equal  $emit-hex:end/disp8
+<span id="L3057" class="LineNr">3057 </span><span class="CommentedCode">#?     # if (EBX == 0) write(out, &quot;00 &quot;) and continue</span>
+<span id="L3058" class="LineNr">3058 </span><span class="CommentedCode">#?     81          7/subop/compare     3/mod/direct    1/rm32/ECX    .           .             .           .           .               0/imm32           # compare ECX</span>
+<span id="L3059" class="LineNr">3059 </span><span class="CommentedCode">#?     75/jump-if-not-equal  $emit-hex:print-octet/disp8</span>
+<span id="L3060" class="LineNr">3060 </span><span class="CommentedCode">#? $emit-hex:pad-zero:</span>
+<span id="L3061" class="LineNr">3061 </span><span class="CommentedCode">#?     # . write(out, &quot;00 &quot;)</span>
+<span id="L3062" class="LineNr">3062 </span><span class="CommentedCode">#?     # . . push args</span>
+<span id="L3063" class="LineNr">3063 </span><span class="CommentedCode">#?     68/push  &quot;00 &quot;/imm32</span>
+<span id="L3064" class="LineNr">3064 </span><span class="CommentedCode">#?     57/push-EDI</span>
+<span id="L3065" class="LineNr">3065 </span><span class="CommentedCode">#?     # . . call</span>
+<span id="L3066" class="LineNr">3066 </span><span class="CommentedCode">#?     e8/call  write/disp32</span>
+<span id="L3067" class="LineNr">3067 </span><span class="CommentedCode">#?     # . . discard args</span>
+<span id="L3068" class="LineNr">3068 </span><span class="CommentedCode">#?     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP</span>
+<span id="L3069" class="LineNr">3069 </span><span class="CommentedCode">#?     eb/jump  $emit-hex:continue/disp8</span>
+<span id="L3070" class="LineNr">3070 </span><span class="CommentedCode">#? $emit-hex:print-octet:</span>
+<span id="L3071" class="LineNr">3071 </span>    <span class="subxComment"># print-byte(out, EBX)</span>
+<span id="L3072" class="LineNr">3072 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L3073" class="LineNr">3073 </span>    53/push-EBX
+<span id="L3074" class="LineNr">3074 </span>    57/push-EDI
+<span id="L3075" class="LineNr">3075 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L3076" class="LineNr">3076 </span>    e8/call  <a href='../066print-byte.subx.html#L8'>print-byte</a>/disp32
+<span id="L3077" class="LineNr">3077 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L3078" class="LineNr">3078 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L3079" class="LineNr">3079 </span>    <span class="subxComment"># write-byte(out, ' ')</span>
+<span id="L3080" class="LineNr">3080 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L3081" class="LineNr">3081 </span>    68/push  0x20/imm32/space
+<span id="L3082" class="LineNr">3082 </span>    57/push-EDI
+<span id="L3083" class="LineNr">3083 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L3084" class="LineNr">3084 </span>    e8/call  <a href='../064write-byte.subx.html#L31'>write-byte</a>/disp32
+<span id="L3085" class="LineNr">3085 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L3086" class="LineNr">3086 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L3087" class="LineNr">3087 </span>    <span class="subxComment"># EBX = EBX &gt;&gt; 8</span>
+<span id="L3088" class="LineNr">3088 </span>    c1/shift    5/subop/logic-right 3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm8            <span class="subxComment"># shift EBX right by 8 bits, while padding zeroes</span>
+<span id="L3089" class="LineNr">3089 </span><span class="CommentedCode">#? $emit-hex:continue:</span>
+<span id="L3090" class="LineNr">3090 </span>    <span class="subxComment"># ++curr</span>
+<span id="L3091" class="LineNr">3091 </span>    41/increment-ECX
+<span id="L3092" class="LineNr">3092 </span>    eb/jump  $emit-hex:loop/disp8
+<span id="L3093" class="LineNr">3093 </span><span class="Constant">$emit-hex:end</span>:
+<span id="L3094" class="LineNr">3094 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L3095" class="LineNr">3095 </span>    5f/pop-to-EDI
+<span id="L3096" class="LineNr">3096 </span>    5b/pop-to-EBX
+<span id="L3097" class="LineNr">3097 </span>    5a/pop-to-EDX
+<span id="L3098" class="LineNr">3098 </span>    59/pop-to-ECX
+<span id="L3099" class="LineNr">3099 </span>    58/pop-to-EAX
+<span id="L3100" class="LineNr">3100 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L3101" class="LineNr">3101 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L3102" class="LineNr">3102 </span>    5d/pop-to-EBP
+<span id="L3103" class="LineNr">3103 </span>    c3/return
+<span id="L3104" class="LineNr">3104 </span>
+<span id="L3105" class="LineNr">3105 </span><span class="subxTest">test-emit-hex-single-byte</span>:
+<span id="L3106" class="LineNr">3106 </span>    <span class="subxComment"># setup</span>
+<span id="L3107" class="LineNr">3107 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L3108" class="LineNr">3108 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L3109" class="LineNr">3109 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L3110" class="LineNr">3110 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L3111" class="LineNr">3111 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L3112" class="LineNr">3112 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L3113" class="LineNr">3113 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L3114" class="LineNr">3114 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
+<span id="L3115" class="LineNr">3115 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L3116" class="LineNr">3116 </span>    b8/copy-to-EAX  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L3117" class="LineNr">3117 </span>    05/add-to-EAX  4/imm32
+<span id="L3118" class="LineNr">3118 </span>    50/push-EAX
+<span id="L3119" class="LineNr">3119 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L3120" class="LineNr">3120 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L3121" class="LineNr">3121 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L3122" class="LineNr">3122 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L3123" class="LineNr">3123 </span>    <span class="subxComment"># emit-hex(_test-buffered-file, 0xab, 1)</span>
+<span id="L3124" class="LineNr">3124 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L3125" class="LineNr">3125 </span>    68/push  1/imm32
+<span id="L3126" class="LineNr">3126 </span>    68/push  0xab/imm32
+<span id="L3127" class="LineNr">3127 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L3128" class="LineNr">3128 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L3129" class="LineNr">3129 </span>    e8/call  <a href='pack.subx.html#L3035'>emit-hex</a>/disp32
+<span id="L3130" class="LineNr">3130 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L3131" class="LineNr">3131 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L3132" class="LineNr">3132 </span>    <span class="subxComment"># flush(_test-buffered-file)</span>
+<span id="L3133" class="LineNr">3133 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L3134" class="LineNr">3134 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L3135" class="LineNr">3135 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L3136" class="LineNr">3136 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
+<span id="L3137" class="LineNr">3137 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L3138" class="LineNr">3138 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L3139" class="LineNr">3139 </span>    <span class="subxComment"># check-ints-equal(*_test-stream-&gt;data, 'ab ', msg)</span>
+<span id="L3140" class="LineNr">3140 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L3141" class="LineNr">3141 </span>    68/push  <span class="Constant">&quot;F - test-emit-hex-single-byte&quot;</span>/imm32
+<span id="L3142" class="LineNr">3142 </span>    68/push  0x206261/imm32
+<span id="L3143" class="LineNr">3143 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;data</span>
+<span id="L3144" class="LineNr">3144 </span>    b8/copy-to-EAX  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L3145" class="LineNr">3145 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L3146" class="LineNr">3146 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L3147" class="LineNr">3147 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L3148" class="LineNr">3148 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L3149" class="LineNr">3149 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L3150" class="LineNr">3150 </span>    <span class="subxS1Comment"># . end</span>
+<span id="L3151" class="LineNr">3151 </span>    c3/return
+<span id="L3152" class="LineNr">3152 </span>
+<span id="L3153" class="LineNr">3153 </span><span class="subxTest">test-emit-hex-multiple-byte</span>:
+<span id="L3154" class="LineNr">3154 </span>    <span class="subxComment"># setup</span>
+<span id="L3155" class="LineNr">3155 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L3156" class="LineNr">3156 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L3157" class="LineNr">3157 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L3158" class="LineNr">3158 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L3159" class="LineNr">3159 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L3160" class="LineNr">3160 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L3161" class="LineNr">3161 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L3162" class="LineNr">3162 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
+<span id="L3163" class="LineNr">3163 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L3164" class="LineNr">3164 </span>    b8/copy-to-EAX  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L3165" class="LineNr">3165 </span>    05/add-to-EAX  4/imm32
+<span id="L3166" class="LineNr">3166 </span>    50/push-EAX
+<span id="L3167" class="LineNr">3167 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L3168" class="LineNr">3168 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L3169" class="LineNr">3169 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L3170" class="LineNr">3170 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L3171" class="LineNr">3171 </span>    <span class="subxComment"># emit-hex(_test-buffered-file, 0x1234, 2)</span>
+<span id="L3172" class="LineNr">3172 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L3173" class="LineNr">3173 </span>    68/push  2/imm32
+<span id="L3174" class="LineNr">3174 </span>    68/push  0x1234/imm32
+<span id="L3175" class="LineNr">3175 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L3176" class="LineNr">3176 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L3177" class="LineNr">3177 </span>    e8/call  <a href='pack.subx.html#L3035'>emit-hex</a>/disp32
+<span id="L3178" class="LineNr">3178 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L3179" class="LineNr">3179 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L3180" class="LineNr">3180 </span>    <span class="subxComment"># flush(_test-buffered-file)</span>
+<span id="L3181" class="LineNr">3181 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L3182" class="LineNr">3182 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L3183" class="LineNr">3183 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L3184" class="LineNr">3184 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
+<span id="L3185" class="LineNr">3185 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L3186" class="LineNr">3186 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L3187" class="LineNr">3187 </span>    <span class="subxComment"># check-stream-equal(_test-stream, &quot;34 12 &quot;, msg)</span>
+<span id="L3188" class="LineNr">3188 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L3189" class="LineNr">3189 </span>    68/push  <span class="Constant">&quot;F - <a href='pack.subx.html#L3153'>test-emit-hex-multiple-byte</a>/1&quot;</span>/imm32
+<span id="L3190" class="LineNr">3190 </span>    68/push  <span class="Constant">&quot;34 12 &quot;</span>/imm32
+<span id="L3191" class="LineNr">3191 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L3192" class="LineNr">3192 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L3193" class="LineNr">3193 </span>    e8/call  <a href='../058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
+<span id="L3194" class="LineNr">3194 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L3195" class="LineNr">3195 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L3196" class="LineNr">3196 </span>    <span class="subxS1Comment"># . end</span>
+<span id="L3197" class="LineNr">3197 </span>    c3/return
+<span id="L3198" class="LineNr">3198 </span>
+<span id="L3199" class="LineNr">3199 </span><span class="subxTest">test-emit-hex-zero-pad</span>:
+<span id="L3200" class="LineNr">3200 </span>    <span class="subxComment"># setup</span>
+<span id="L3201" class="LineNr">3201 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L3202" class="LineNr">3202 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L3203" class="LineNr">3203 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L3204" class="LineNr">3204 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L3205" class="LineNr">3205 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L3206" class="LineNr">3206 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L3207" class="LineNr">3207 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L3208" class="LineNr">3208 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
+<span id="L3209" class="LineNr">3209 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L3210" class="LineNr">3210 </span>    b8/copy-to-EAX  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L3211" class="LineNr">3211 </span>    05/add-to-EAX  4/imm32
+<span id="L3212" class="LineNr">3212 </span>    50/push-EAX
+<span id="L3213" class="LineNr">3213 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L3214" class="LineNr">3214 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L3215" class="LineNr">3215 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L3216" class="LineNr">3216 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L3217" class="LineNr">3217 </span>    <span class="subxComment"># emit-hex(_test-buffered-file, 0xab, 2)</span>
+<span id="L3218" class="LineNr">3218 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L3219" class="LineNr">3219 </span>    68/push  2/imm32
+<span id="L3220" class="LineNr">3220 </span>    68/push  0xab/imm32
+<span id="L3221" class="LineNr">3221 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L3222" class="LineNr">3222 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L3223" class="LineNr">3223 </span>    e8/call  <a href='pack.subx.html#L3035'>emit-hex</a>/disp32
+<span id="L3224" class="LineNr">3224 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L3225" class="LineNr">3225 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L3226" class="LineNr">3226 </span>    <span class="subxComment"># flush(_test-buffered-file)</span>
+<span id="L3227" class="LineNr">3227 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L3228" class="LineNr">3228 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L3229" class="LineNr">3229 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L3230" class="LineNr">3230 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
+<span id="L3231" class="LineNr">3231 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L3232" class="LineNr">3232 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L3233" class="LineNr">3233 </span>    <span class="subxComment"># check(_test-stream-&gt;data == 'ab 00 ')</span>
+<span id="L3234" class="LineNr">3234 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L3235" class="LineNr">3235 </span>    68/push  <span class="Constant">&quot;F - <a href='pack.subx.html#L3199'>test-emit-hex-zero-pad</a>/1&quot;</span>/imm32
+<span id="L3236" class="LineNr">3236 </span>    68/push  <span class="Constant">&quot;ab 00 &quot;</span>/imm32
+<span id="L3237" class="LineNr">3237 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L3238" class="LineNr">3238 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L3239" class="LineNr">3239 </span>    e8/call  <a href='../058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
+<span id="L3240" class="LineNr">3240 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L3241" class="LineNr">3241 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L3242" class="LineNr">3242 </span>    <span class="subxS1Comment"># . end</span>
+<span id="L3243" class="LineNr">3243 </span>    c3/return
+<span id="L3244" class="LineNr">3244 </span>
+<span id="L3245" class="LineNr">3245 </span><span class="subxTest">test-emit-hex-negative</span>:
+<span id="L3246" class="LineNr">3246 </span>    <span class="subxComment"># setup</span>
+<span id="L3247" class="LineNr">3247 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L3248" class="LineNr">3248 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L3249" class="LineNr">3249 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L3250" class="LineNr">3250 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L3251" class="LineNr">3251 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L3252" class="LineNr">3252 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L3253" class="LineNr">3253 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L3254" class="LineNr">3254 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
+<span id="L3255" class="LineNr">3255 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L3256" class="LineNr">3256 </span>    b8/copy-to-EAX  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L3257" class="LineNr">3257 </span>    05/add-to-EAX  4/imm32
+<span id="L3258" class="LineNr">3258 </span>    50/push-EAX
+<span id="L3259" class="LineNr">3259 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L3260" class="LineNr">3260 </span>    e8/call  <a href='../055stream.subx.html#L17'>clear-stream</a>/disp32
+<span id="L3261" class="LineNr">3261 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L3262" class="LineNr">3262 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L3263" class="LineNr">3263 </span>    <span class="subxComment"># emit-hex(_test-buffered-file, -1, 2)</span>
+<span id="L3264" class="LineNr">3264 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L3265" class="LineNr">3265 </span>    68/push  2/imm32
+<span id="L3266" class="LineNr">3266 </span>    68/push  -1/imm32
+<span id="L3267" class="LineNr">3267 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L3268" class="LineNr">3268 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L3269" class="LineNr">3269 </span>    e8/call  <a href='pack.subx.html#L3035'>emit-hex</a>/disp32
+<span id="L3270" class="LineNr">3270 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L3271" class="LineNr">3271 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L3272" class="LineNr">3272 </span>    <span class="subxComment"># flush(_test-buffered-file)</span>
+<span id="L3273" class="LineNr">3273 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L3274" class="LineNr">3274 </span>    68/push  <a href='../061read-byte.subx.html#L289'>_test-buffered-file</a>/imm32
+<span id="L3275" class="LineNr">3275 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L3276" class="LineNr">3276 </span>    e8/call  <a href='../064write-byte.subx.html#L79'>flush</a>/disp32
+<span id="L3277" class="LineNr">3277 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L3278" class="LineNr">3278 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L3279" class="LineNr">3279 </span>    <span class="subxComment"># check-stream-equal(_test-stream == &quot;ff ff &quot;)</span>
+<span id="L3280" class="LineNr">3280 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L3281" class="LineNr">3281 </span>    68/push  <span class="Constant">&quot;F - <a href='pack.subx.html#L3245'>test-emit-hex-negative</a>/1&quot;</span>/imm32
+<span id="L3282" class="LineNr">3282 </span>    68/push  <span class="Constant">&quot;ff ff &quot;</span>/imm32
+<span id="L3283" class="LineNr">3283 </span>    68/push  <a href='../057write.subx.html#L148'>_test-stream</a>/imm32
+<span id="L3284" class="LineNr">3284 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L3285" class="LineNr">3285 </span>    e8/call  <a href='../058stream-equal.subx.html#L199'>check-stream-equal</a>/disp32
+<span id="L3286" class="LineNr">3286 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L3287" class="LineNr">3287 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L3288" class="LineNr">3288 </span>    <span class="subxS1Comment"># . end</span>
+<span id="L3289" class="LineNr">3289 </span>    c3/return
+<span id="L3290" class="LineNr">3290 </span>
+<span id="L3291" class="LineNr">3291 </span>== data
+<span id="L3292" class="LineNr">3292 </span>
+<span id="L3293" class="LineNr">3293 </span><span class="subxMinorFunction">_test-slice-negative-two</span>:
+<span id="L3294" class="LineNr">3294 </span>    2d/- 32/2
+<span id="L3295" class="LineNr">3295 </span><span class="subxMinorFunction">_test-slice-negative-two-end</span>:
+<span id="L3296" class="LineNr">3296 </span>    2f/slash 66/f 6f/o 6f/o
+<span id="L3297" class="LineNr">3297 </span><span class="subxMinorFunction">_test-slice-negative-two-metadata-end</span>:
+<span id="L3298" class="LineNr">3298 </span>
+<span id="L3299" class="LineNr">3299 </span><span class="subxMinorFunction">_test-slice-three-zero</span>:
+<span id="L3300" class="LineNr">3300 </span>    33/3 30/0
+<span id="L3301" class="LineNr">3301 </span><span class="subxMinorFunction">_test-slice-three-zero-end</span>:
+<span id="L3302" class="LineNr">3302 </span>
+<span id="L3303" class="LineNr">3303 </span><span class="subxMinorFunction">_test-slice-non-number-word</span>:
+<span id="L3304" class="LineNr">3304 </span>    78/x 79/y 7a/z
+<span id="L3305" class="LineNr">3305 </span><span class="subxMinorFunction">_test-slice-non-number-word-end</span>:
+<span id="L3306" class="LineNr">3306 </span>    2f/slash
+<span id="L3307" class="LineNr">3307 </span><span class="subxMinorFunction">_test-slice-non-number-word-metadata-end</span>:
+<span id="L3308" class="LineNr">3308 </span>
+<span id="L3309" class="LineNr">3309 </span><span class="subxMinorFunction">_test-input-stream</span>:
+<span id="L3310" class="LineNr">3310 </span>    <span class="subxComment"># current write index</span>
+<span id="L3311" class="LineNr">3311 </span>    0/imm32
+<span id="L3312" class="LineNr">3312 </span>    <span class="subxComment"># current read index</span>
+<span id="L3313" class="LineNr">3313 </span>    0/imm32
+<span id="L3314" class="LineNr">3314 </span>    <span class="subxComment"># length</span>
+<span id="L3315" class="LineNr">3315 </span>    0x20/imm32
+<span id="L3316" class="LineNr">3316 </span>    <span class="subxComment"># data</span>
+<span id="L3317" class="LineNr">3317 </span>    00 00 00 00 00 00 00 00  <span class="subxComment"># 8 bytes</span>
+<span id="L3318" class="LineNr">3318 </span>    00 00 00 00 00 00 00 00  <span class="subxComment"># 8 bytes</span>
+<span id="L3319" class="LineNr">3319 </span>    00 00 00 00 00 00 00 00  <span class="subxComment"># 8 bytes</span>
+<span id="L3320" class="LineNr">3320 </span>    00 00 00 00 00 00 00 00  <span class="subxComment"># 8 bytes</span>
+<span id="L3321" class="LineNr">3321 </span>
+<span id="L3322" class="LineNr">3322 </span><span class="subxComment"># a test buffered file for _test-input-stream</span>
+<span id="L3323" class="LineNr">3323 </span><span class="subxMinorFunction">_test-input-buffered-file</span>:
+<span id="L3324" class="LineNr">3324 </span>    <span class="subxComment"># file descriptor or (address stream)</span>
+<span id="L3325" class="LineNr">3325 </span>    <a href='pack.subx.html#L3309'>_test-input-stream</a>/imm32
+<span id="L3326" class="LineNr">3326 </span>    <span class="subxComment"># current write index</span>
+<span id="L3327" class="LineNr">3327 </span>    0/imm32
+<span id="L3328" class="LineNr">3328 </span>    <span class="subxComment"># current read index</span>
+<span id="L3329" class="LineNr">3329 </span>    0/imm32
+<span id="L3330" class="LineNr">3330 </span>    <span class="subxComment"># length</span>
+<span id="L3331" class="LineNr">3331 </span>    6/imm32
+<span id="L3332" class="LineNr">3332 </span>    <span class="subxComment"># data</span>
+<span id="L3333" class="LineNr">3333 </span>    00 00 00 00 00 00  <span class="subxComment"># 6 bytes</span>
+<span id="L3334" class="LineNr">3334 </span>
+<span id="L3335" class="LineNr">3335 </span><span class="subxMinorFunction">_test-output-stream</span>:
+<span id="L3336" class="LineNr">3336 </span>    <span class="subxComment"># current write index</span>
+<span id="L3337" class="LineNr">3337 </span>    0/imm32
+<span id="L3338" class="LineNr">3338 </span>    <span class="subxComment"># current read index</span>
+<span id="L3339" class="LineNr">3339 </span>    0/imm32
+<span id="L3340" class="LineNr">3340 </span>    <span class="subxComment"># length</span>
+<span id="L3341" class="LineNr">3341 </span>    0x20/imm32
+<span id="L3342" class="LineNr">3342 </span>    <span class="subxComment"># data</span>
+<span id="L3343" class="LineNr">3343 </span>    00 00 00 00 00 00 00 00  <span class="subxComment"># 8 bytes</span>
+<span id="L3344" class="LineNr">3344 </span>    00 00 00 00 00 00 00 00  <span class="subxComment"># 8 bytes</span>
+<span id="L3345" class="LineNr">3345 </span>    00 00 00 00 00 00 00 00  <span class="subxComment"># 8 bytes</span>
+<span id="L3346" class="LineNr">3346 </span>    00 00 00 00 00 00 00 00  <span class="subxComment"># 8 bytes</span>
+<span id="L3347" class="LineNr">3347 </span>
+<span id="L3348" class="LineNr">3348 </span><span class="subxComment"># a test buffered file for _test-output-stream</span>
+<span id="L3349" class="LineNr">3349 </span><span class="subxMinorFunction">_test-output-buffered-file</span>:
+<span id="L3350" class="LineNr">3350 </span>    <span class="subxComment"># file descriptor or (address stream)</span>
+<span id="L3351" class="LineNr">3351 </span>    <a href='pack.subx.html#L3335'>_test-output-stream</a>/imm32
+<span id="L3352" class="LineNr">3352 </span>    <span class="subxComment"># current write index</span>
+<span id="L3353" class="LineNr">3353 </span>    0/imm32
+<span id="L3354" class="LineNr">3354 </span>    <span class="subxComment"># current read index</span>
+<span id="L3355" class="LineNr">3355 </span>    0/imm32
+<span id="L3356" class="LineNr">3356 </span>    <span class="subxComment"># length</span>
+<span id="L3357" class="LineNr">3357 </span>    6/imm32
+<span id="L3358" class="LineNr">3358 </span>    <span class="subxComment"># data</span>
+<span id="L3359" class="LineNr">3359 </span>    00 00 00 00 00 00  <span class="subxComment"># 6 bytes</span>
+<span id="L3360" class="LineNr">3360 </span>
+<span id="L3361" class="LineNr">3361 </span><span class="subxMinorFunction">_test-slice-hexlike-non-number-word</span>:
+<span id="L3362" class="LineNr">3362 </span>    61/a 62/b 63/c 64/d
+<span id="L3363" class="LineNr">3363 </span><span class="subxMinorFunction">_test-slice-hexlike-non-number-word-end</span>:
+<span id="L3364" class="LineNr">3364 </span>    2f/slash
+<span id="L3365" class="LineNr">3365 </span>    78/x 79/y 7a/z
+<span id="L3366" class="LineNr">3366 </span><span class="subxMinorFunction">_test-slice-hexlike-non-number-word-metadata-end</span>:
+<span id="L3367" class="LineNr">3367 </span>
+<span id="L3368" class="LineNr">3368 </span><span class="subxMinorFunction">_test-slice-with-slash-prefix</span>:
+<span id="L3369" class="LineNr">3369 </span>  2f/slash 30/0 33/3
+<span id="L3370" class="LineNr">3370 </span><span class="subxMinorFunction">_test-slice-with-slash-prefix-end</span>:
+<span id="L3371" class="LineNr">3371 </span>
+<span id="L3372" class="LineNr">3372 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex10.subx.html b/html/subx/examples/ex10.subx.html
index 1a2ce066..c3b047b7 100644
--- a/html/subx/examples/ex10.subx.html
+++ b/html/subx/examples/ex10.subx.html
@@ -107,7 +107,7 @@ if ('onhashchange' in window) {
 <span id="L48" class="LineNr">48 </span>    3d/compare-EAX  0/imm32
 <span id="L49" class="LineNr">49 </span>    74/jump-if-equal  $argv-equal:break/disp8
 <span id="L50" class="LineNr">50 </span>    <span class="subxComment"># if (c1 != c2) return false</span>
-<span id="L51" class="LineNr">51 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX with EBX</span>
+<span id="L51" class="LineNr">51 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX and EBX</span>
 <span id="L52" class="LineNr">52 </span>    75/jump-if-not-equal  $argv-equal:false/disp8
 <span id="L53" class="LineNr">53 </span>    <span class="subxComment"># ++s1, ++s2</span>
 <span id="L54" class="LineNr">54 </span>    41/inc-ECX
diff --git a/html/subx/examples/ex11.subx.html b/html/subx/examples/ex11.subx.html
index 26de0fa6..f0b64cf8 100644
--- a/html/subx/examples/ex11.subx.html
+++ b/html/subx/examples/ex11.subx.html
@@ -96,7 +96,7 @@ if ('onhashchange' in window) {
 <span id="L34" class="LineNr"> 34 </span>    <span class="subxComment">#   s1 = s</span>
 <span id="L35" class="LineNr"> 35 </span>    <span class="subxComment">#   s2 = benchmark-&gt;data</span>
 <span id="L36" class="LineNr"> 36 </span>    <span class="subxComment">#   i = 0</span>
-<span id="L37" class="LineNr"> 37 </span>    <span class="subxComment">#   while (i &lt; n)</span>
+<span id="L37" class="LineNr"> 37 </span>    <span class="subxComment">#   while i &lt; n</span>
 <span id="L38" class="LineNr"> 38 </span>    <span class="subxComment">#     c1 = *s1</span>
 <span id="L39" class="LineNr"> 39 </span>    <span class="subxComment">#     c2 = *s2</span>
 <span id="L40" class="LineNr"> 40 </span>    <span class="subxComment">#     if (c1 == 0) return false</span>
@@ -145,7 +145,7 @@ if ('onhashchange' in window) {
 <span id="L83" class="LineNr"> 83 </span>    3d/compare-EAX  0/imm32
 <span id="L84" class="LineNr"> 84 </span>    74/jump-if-equal  $kernel-string-equal?:false/disp8
 <span id="L85" class="LineNr"> 85 </span>    <span class="subxComment"># if (c1 != c2) return false</span>
-<span id="L86" class="LineNr"> 86 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX with EBX</span>
+<span id="L86" class="LineNr"> 86 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX and EBX</span>
 <span id="L87" class="LineNr"> 87 </span>    75/jump-if-not-equal  $kernel-string-equal?:false/disp8
 <span id="L88" class="LineNr"> 88 </span>    <span class="subxComment"># ++i</span>
 <span id="L89" class="LineNr"> 89 </span>    41/inc-ECX